22b6cfa35c
The main idea is to get rid of the "unset MAKEFLAGS". AFAI can see, the whole CPU stuff isn't used anymore. So we can drop the whole FB_CPU_ARG handling. Since LO doesn't use any of make's implicit rules, the build breaks, but luckily it just requires a single rule for the btyacc build - just a Firebuild build tool. Then there is the whole broken handling of LIBTOMMATH and LIBATOMIC_OPS already in LO's configure.ac. I don't know if any internal build of Firebird with these as system libs would work. I guess people either have a system Firebird or also build with internal libtommath and libatomic_ops. This fixes just the obvious errors. I didn't try to build it, so there might still be typos (TBH I thought hard about just dropping the system build of these libraries, after seeing the broken configure.ac). And I'm not sure our / the system boost preprocessor library is ever used over the Firebird-internal copy. It also looks like it's also just used in an other build tool and nothing of the Firebird DB itself depends on it. Then there is the movement of the install_name_tool / otool patching on MacOS from the patch into the ExternalProject to further shrink the patches, as the build doesn't depend on it. This also introduces a different debug build mode for the gcc-/g++-wrapper: MSVC_USE_INDIVIDUAL_PDBS. It uses -Fd to write a separate PDB per output file instead of using -FS to use sync writes to a single PDB, which might work around the PDB access failures seen by Jenkins for linking executables. In theory it's also faster and should work with all the other wrapper users, but I don't want to open that can of additional build errors (yet), for eventually marginal gains. Change-Id: I8d4c5d2f17def9e840a67ef1004787e8baaffa83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105902 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
12 lines
340 B
Diff
12 lines
340 B
Diff
--- extern/btyacc/Makefile.orig 2020-11-13 18:57:44.831455058 +0100
|
|
+++ extern/btyacc/Makefile 2020-11-13 18:59:19.071078333 +0100
|
|
@@ -44,6 +44,9 @@
|
|
$(PROGRAM): $(OBJS) $(LIBS)
|
|
$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
|
|
|
|
+%.o: %.c
|
|
+ $(CC) $(CCFLAGS) -c $< -o $@
|
|
+
|
|
clean:; rm -f $(OBJS)
|
|
|
|
clobber:; rm -f $(OBJS) $(PROGRAM)
|