This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "theslinux-buildsystem".
The branch, _utils has been updated
via 846b964978ad4066685f1f789ee5cfa6ba903485 (commit)
via e2723421d20eb4c27dc7c55e3a9bf443780145dd (commit)
from 135395a40df1e1abb47204982eff5ce1c8fa3144 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 846b964978ad4066685f1f789ee5cfa6ba903485
Author: Ky-Anh Huynh <ky...@theslinux.org>
Date: Sat Dec 6 21:19:23 2014 +0700
pkgbuild#_pkgbuild_load: fix $CXX for %lib32 support
For %lib32, we manually add "-m32" flag to $CXX. This is because
some linking program may not read "-m32" from $CFLAGS. For example,
in #uim, by setting "QMAKE_LINK = @CXX@" in "common.pro.in", the
#qmake program will tell #qt to use "g++" for linking. The correct
linker should be "g++ -m32".
FIXME: I am not sure this is the best/correct way.
commit e2723421d20eb4c27dc7c55e3a9bf443780145dd
Author: Ky-Anh Huynh <ky...@theslinux.org>
Date: Sat Dec 6 20:10:21 2014 +0700
!bug: use %lib32 flags event if the feature is not set
That is too stupid check. The flags follow $_FEATURE_LIB32, but
the buggy check is to follow $_FEATURE_STRING :D
-----------------------------------------------------------------------
Summary of changes:
_utils/lib/pkgbuild.sh | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/_utils/lib/pkgbuild.sh b/_utils/lib/pkgbuild.sh
index 0c2c09a..9775bd4 100644
--- a/_utils/lib/pkgbuild.sh
+++ b/_utils/lib/pkgbuild.sh
@@ -53,11 +53,14 @@ _pkgbuild_load() {
# already loaded by `makepkg`. Because of this, some sanity check
# for `makepkg.conf` settings can't be done in feature `makepkg.conf`.
if [[ -n "${_FEATURE_STRING}" ]]; then
- # Some default flags
- export CHOST="i686-pc-linux-gnu"
- export CFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe
-fstack-protector-strong --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- export CXXFLAGS="${CFLAGS}"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ if [[ -n "${_FEATURE_LIB32}" ]]; then
+ export CHOST="i686-pc-linux-gnu"
+ export CFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe
-fstack-protector-strong --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ export CXXFLAGS="${CFLAGS}"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export CXX="${CXX} -m32"
+ fi
if [[ -r "makepkg.conf${_FEATURE_STRING}" ]]; then
source "makepkg.conf${_FEATURE_STRING}" || return
hooks/post-receive
--
theslinux-buildsystem
--
To unsubscribe from the list phantom@lists.theslinux.org,
please send an email to ecar...@lists.theslinux.org with subject
unsubscribe phantom
To get basic commands to use Ecartis system, use subject 'help'.
