45e2c3bd44
Removed dmraid, iniparser, jam, libatasmart, libblockdev, libbytesize, libyaml, mozjs, ndctl, polkit, rpi-userland, sccache from base
Removed docdir, sysconfdir and prefix quotes from autoconf build option and similar options from various packages in base
Added apparch variables to base/{acpid,dmidecode,gnu-efi,pciutils,syslinux}
Added udev rules build option to base/alsa-utils
Discarded --offline option in base/cbindgen
Upgraded base/cmake to 3.26.4
Added --without-x build option to base/dialog
Upgraded base/gawk to 5.2.2
Upgraded base/glib to 2.76.3
Disabled tests and examples in base/gloox
Upgraded base/gnupg2 to 2.2.41
Upgraded base/gnutls to 3.8.0
Upgraded base/gpgme to 1.20.0
Fixed make command option ordering in base/{hdparm,p7zip}
Upgraded base/libgpg-error to 1.47
Upgraded base/libjpeg-turbo to 2.1.5.1
Upgraded base/libuv to 1.45.0
Discarded some build options to base/libxml2
Upgraded base/llvm to 15.0.7
Fixed subshell code in base/lua53
Removed --prefix= in several python package build files, added /usr as prefix in base/python3
Upgraded base/musl to 1.2.4
Upgraded base/nettle to 3.9
Upgraded base/nghttp2 to 1.53.0
Added --without-trust-paths to base/p11-kit
Upgraded base/qpdf to 11.4.0
Discarded base/rpi-userland
Upgraded base/rust to 1.69.0
Upgraded base/sqlite to 3420000
Added $CFLAGS to base/unzip
Added -fPIC option to base/yasm
Updated base build list
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
Respect CC, *FLAGS. Add datarootdir for autoconf-2.60 warnings.
|
|
|
|
--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
|
|
+++ ftjam-2.5.3rc2/builds/unix/Makefile.in
|
|
@@ -37,6 +37,7 @@ exec_prefix := @exec_prefix@
|
|
libdir := @libdir@
|
|
bindir := @bindir@
|
|
includedir := @includedir@
|
|
+datarootdir := @datarootdir@
|
|
datadir := @datadir@
|
|
|
|
version_info := @version_info@
|
|
--- ftjam-2.5.3rc2-orig/jambase.c
|
|
+++ ftjam-2.5.3rc2/jambase.c
|
|
@@ -652,21 +652,21 @@ const char *jambase[] = {
|
|
"\n",
|
|
"AR ?= ar ru ;\n",
|
|
"AS ?= as ;\n",
|
|
-"ASFLAGS ?= ;\n",
|
|
+"ASFLAGS += $(ASFLAGS) ;\n",
|
|
"AWK ?= awk ;\n",
|
|
"BINDIR ?= /usr/local/bin ;\n",
|
|
-"C++ ?= cc ;\n",
|
|
-"C++FLAGS ?= ;\n",
|
|
-"CC ?= cc ;\n",
|
|
-"CCFLAGS ?= ;\n",
|
|
+"C++ ?= $(CXX) ;\n",
|
|
+"C++FLAGS += $(CXXFLAGS) ;\n",
|
|
+"CC ?= $(CC) ;\n",
|
|
+"CCFLAGS += $(CFLAGS) ;\n",
|
|
"CP ?= cp -f ;\n",
|
|
"CRELIB ?= ;\n",
|
|
"DOT ?= . ;\n",
|
|
"DOTDOT ?= .. ;\n",
|
|
"EXEMODE ?= 711 ;\n",
|
|
"FILEMODE ?= 644 ;\n",
|
|
-"FORTRAN ?= f77 ;\n",
|
|
-"FORTRANFLAGS ?= ;\n",
|
|
+"FORTRAN ?= $(F77) ;\n",
|
|
+"FORTRANFLAGS += $(FFLAGS) ;\n",
|
|
"HDRS ?= ;\n",
|
|
"INSTALLGRIST ?= installed ;\n",
|
|
"JAMFILE ?= Jamfile ;\n",
|
|
@@ -674,13 +674,13 @@ const char *jambase[] = {
|
|
"LEX ?= ;\n",
|
|
"LIBDIR ?= /usr/local/lib ;\n",
|
|
"LINK ?= $(CC) ;\n",
|
|
-"LINKFLAGS ?= ;\n",
|
|
+"LINKFLAGS += $(LDFLAGS) ;\n",
|
|
"LINKLIBS ?= ;\n",
|
|
"LN ?= ln ;\n",
|
|
"MANDIR ?= /usr/local/man ;\n",
|
|
"MKDIR ?= mkdir ;\n",
|
|
"MV ?= mv -f ;\n",
|
|
-"OPTIM ?= ;\n",
|
|
+"OPTIM = ;\n",
|
|
"RCP ?= rcp ;\n",
|
|
"RM ?= rm -f ;\n",
|
|
"RMDIR ?= $(RM) ;\n",
|