From 0e36a18b56acd90856e26a2b68c7f7df46ff0f83 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Tue, 4 Oct 2022 20:20:41 +0530 Subject: [PATCH] Fixed CFLAGS variable in base/{db,gawk} Converted uppercase variables to lowercase variables in base/fftw Insert CFLAGS into following build files since the CFLAGS set by bldpkg are not respected by the build systems of these packages: -> giflib -> git -> libelf-compat Discarded V=s and V=1 arguments from make command in base/{hdparm,hunspell,jam} Discarded CPU architecture check and related builddist variable from base/gmp Removed command to discard static library in base/libaio Temporarily commented out sed command in base/libxml2 --- base/db/db.SMBuild | 2 +- base/ed/ed.SMBuild | 2 +- base/fftw/fftw.SMBuild | 14 +++++++------- base/gawk/gawk.SMBuild | 4 ++-- base/giflib/giflib.SMBuild | 2 +- base/git/git.SMBuild | 4 ++-- base/gmp/gmp.SMBuild | 6 +----- base/hdparm/hdparm.SMBuild | 2 +- base/hunspell/hunspell.SMBuild | 2 +- base/jam/jam.SMBuild | 2 +- base/libaio/libaio.SMBuild | 2 -- base/libelf-compat/libelf-compat.SMBuild | 2 +- base/libxml2/libxml2.SMBuild | 5 +++-- 13 files changed, 22 insertions(+), 27 deletions(-) diff --git a/base/db/db.SMBuild b/base/db/db.SMBuild index 0aac0ba..c1636af 100755 --- a/base/db/db.SMBuild +++ b/base/db/db.SMBuild @@ -24,7 +24,7 @@ build() { cd build_unix - CFLAGS="-D_GNU_SOURCE" \ + CFLAGS="$CFLAGS -D_GNU_SOURCE" \ db_cv_clock_monotonic=yes \ db_cv_build_sequence=yes \ db_cv_mmap_extend=yes \ diff --git a/base/ed/ed.SMBuild b/base/ed/ed.SMBuild index d77db41..a4cae02 100755 --- a/base/ed/ed.SMBuild +++ b/base/ed/ed.SMBuild @@ -17,7 +17,7 @@ build() { ./configure \ --prefix="" - make + make CFLAGS="$CFLAGS" make install DESTDIR=$pkg cp COPYING $pkgdocs/ diff --git a/base/fftw/fftw.SMBuild b/base/fftw/fftw.SMBuild index 28c7142..61814ad 100755 --- a/base/fftw/fftw.SMBuild +++ b/base/fftw/fftw.SMBuild @@ -18,22 +18,22 @@ build() { # Default compile options defconfopts() { - [ "$ARCH" = "aarch64" ] && \ - ADDCONFIGOPTS="--enable-openmp" + [ "$arch" = "aarch64" ] && \ + addconfigopts="--enable-openmp" ./configure \ --prefix="" \ --enable-shared \ --disable-static \ --enable-threads \ - $ADDCONFIGOPTS \ - $LIBOPTIONS + $addconfigopts \ + $liboptions } defmakeopts() { make make install DESTDIR=$pkg make clean - unset LIBOPTIONS + unset liboptions } # Standard build @@ -41,12 +41,12 @@ build() { defmakeopts # Build with floating-point libs - LIBOPTIONS=--enable-float + liboptions=--enable-float defconfopts defmakeopts # Build with double-precision libs - LIBOPTIONS=--enable-long-double + liboptions=--enable-long-double defconfopts make make install DESTDIR=$pkg diff --git a/base/gawk/gawk.SMBuild b/base/gawk/gawk.SMBuild index 8a0e5f4..45b7ffa 100755 --- a/base/gawk/gawk.SMBuild +++ b/base/gawk/gawk.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - CFLAGS="-static" \ + CFLAGS="$CFLAGS -static" \ ./configure \ --prefix="" \ --libexecdir=/lib \ @@ -22,7 +22,7 @@ build() { --without-mpfr \ --without-readline - make CFLAGS="-static" + make make install DESTDIR=$pkg cp COPYING $pkgdocs/ diff --git a/base/giflib/giflib.SMBuild b/base/giflib/giflib.SMBuild index 55e5b06..39fade9 100755 --- a/base/giflib/giflib.SMBuild +++ b/base/giflib/giflib.SMBuild @@ -16,7 +16,7 @@ build() { applypatch $srcdir/giflib-5.1.9-fix-missing-quantize-API-symbols.patch - make + make CFLAGS="$CFLAGS" make install DESTDIR=$pkg PREFIX="/" cp COPYING $pkgdocs/ diff --git a/base/git/git.SMBuild b/base/git/git.SMBuild index 4651572..73feeb3 100755 --- a/base/git/git.SMBuild +++ b/base/git/git.SMBuild @@ -14,11 +14,11 @@ build() { cd $app-$version fixbuilddirpermissions - make CC="$CC" $MAKEFLAGS \ + make CC="$CC" $MAKEFLAGS CFLAGS="$CFLAGS" \ prefix="/" gitexecdir="/lib/git-core" \ NO_TCLTK=1 NO_PYTHON=1 NO_EXPAT=1 NO_GETTEXT=1 \ NO_REGEX=NeedsStartEnd \ - DESTDIR="$pkg" V=1 all install install-man + DESTDIR="$pkg" all install install-man rm -f $pkg/lib/perl5/core_perl_perllocal.pod install -Dm 755 gitk-git/gitk $pkg/bin/gitk diff --git a/base/gmp/gmp.SMBuild b/base/gmp/gmp.SMBuild index 365a3f0..5219d9b 100755 --- a/base/gmp/gmp.SMBuild +++ b/base/gmp/gmp.SMBuild @@ -14,14 +14,10 @@ build() { cd $app-$version fixbuilddirpermissions - printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in - [ "$arch" = "aarch64" ] && builddist="--build=aarch64-musl-linux" - ./configure \ --prefix="" \ --with-pic \ - --enable-cxx \ - $builddist + --enable-cxx make make install DESTDIR=$pkg diff --git a/base/hdparm/hdparm.SMBuild b/base/hdparm/hdparm.SMBuild index 791a988..9b87dc9 100755 --- a/base/hdparm/hdparm.SMBuild +++ b/base/hdparm/hdparm.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - make V=s + make make install DESTDIR=$pkg mandir="/share/man" sbindir="/bin" cp LICENSE.TXT $pkgdocs/ diff --git a/base/hunspell/hunspell.SMBuild b/base/hunspell/hunspell.SMBuild index c81b57c..968bd08 100755 --- a/base/hunspell/hunspell.SMBuild +++ b/base/hunspell/hunspell.SMBuild @@ -19,7 +19,7 @@ build() { --disable-static \ --disable-nls - make V=1 + make make install DESTDIR=$pkg cp COPYING* $pkgdocs/ diff --git a/base/jam/jam.SMBuild b/base/jam/jam.SMBuild index 74c44b4..171fd51 100755 --- a/base/jam/jam.SMBuild +++ b/base/jam/jam.SMBuild @@ -15,7 +15,7 @@ build() { unzip $srcdir/$app-$version.zip fixbuilddirpermissions - make V=s + make ./jam0 -sBINDIR=$pkg/bin install cp Porting README $pkgdocs/ diff --git a/base/libaio/libaio.SMBuild b/base/libaio/libaio.SMBuild index b472806..aec9005 100755 --- a/base/libaio/libaio.SMBuild +++ b/base/libaio/libaio.SMBuild @@ -17,8 +17,6 @@ build() { make make prefix="$pkg" libdir=$pkg/lib install - rm -f $pkg/lib/libaio.a - cp COPYING $pkgdocs/ mkfinalpkg diff --git a/base/libelf-compat/libelf-compat.SMBuild b/base/libelf-compat/libelf-compat.SMBuild index cf5aed8..32eda41 100755 --- a/base/libelf-compat/libelf-compat.SMBuild +++ b/base/libelf-compat/libelf-compat.SMBuild @@ -13,7 +13,7 @@ build() { cd $app-$version fixbuilddirpermissions - echo "CFLAGS += -fPIC" > config.mak + echo "CFLAGS += $CFLAGS -fPIC" > config.mak sed -i 's@HEADERS = src/libelf.h@HEADERS = src/libelf.h src/gelf.h@' Makefile make diff --git a/base/libxml2/libxml2.SMBuild b/base/libxml2/libxml2.SMBuild index 9727a61..4113326 100755 --- a/base/libxml2/libxml2.SMBuild +++ b/base/libxml2/libxml2.SMBuild @@ -25,7 +25,7 @@ build() { --disable-silent-rules \ --with-python=/bin/python3 - sed -i 's@-L -L@@g' python/Makefile + #sed -i 's@-L -L@@g' python/Makefile make make install DESTDIR=$pkg @@ -36,7 +36,8 @@ build() { } sha512sums=" -df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd libxml2-2.9.12.tar.gz +7a2a9b03cc7a1f3ed3d64871818039bc3f658979c37d0e43685f400838c22c081c23a058b8599f1d27b4d3ea95cdbbb4f328fc541f27501cde5eacd2a9125546 libxml2-2.9.12.tar.lz a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7 libxml2-2.9.8-python3-unicode-errors.patch 347178e432379d543683cba21b902e7305202c03e8dbd724ae395963d677096a5cfc4e345e208d498163ca5174683c167610fc2b297090476038bc2bb7c84b4f revert-Make-xmlFreeNodeList-non-recursive.patch +3cee30d3c190879e31f4bf27699b5a9ed2a8615982375078702150dbdf9171bf0527b48a63beaa79de6afee5725076fb5214c27235737ab9b42d869d1c3c8b1c 652dd12a858989b14eed4e84e453059cd3ba340e.diff "