diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-04-10 15:03:21 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-04-10 15:03:21 -0300 |
| commit | 4cf9c947c794fe5e5906d3c5350e9aada30b31ae (patch) | |
| tree | d99092e47ba49d6c462f57e39affc2e8dda67795 /libre | |
| parent | f99c89c057344416abcf7c0a10d85a39cc36b9af (diff) | |
ice{ape-libre,cat,dove-libre,weasel-libre}: Add workaround for preprocessor misdetection
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/iceape-libre/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/icecat/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/icedove-libre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 10 |
4 files changed, 19 insertions, 13 deletions
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 3c0d6942a..b86107e16 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -93,9 +93,11 @@ build() { rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg cp "${srcdir}/mozconfig" .mozconfig - unset CPPFLAGS - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 6898105d8..bf16eca0b 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -136,6 +136,10 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index f7962b8f5..90aa96d1a 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -65,7 +65,7 @@ build() { install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" done - # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh + # This patch fixes a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh rm -v debian/patches/debian-hacks/Icedove-branding.patch || true quilt push -av @@ -75,9 +75,11 @@ build() { patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version cp "${srcdir}/mozconfig" .mozconfig - unset CPPFLAGS - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 283d6e088..0c9520b17 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -143,17 +143,15 @@ build() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + if $_pgo; then - unset CPPFLAGS - export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" kill $! || true else - unset CPPFLAGS - export CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" - export CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" fi } |