Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f3eb0d4d5f8d20cacadfb32dfe471b55288f9bb
commit 4f3eb0d4d5f8d20cacadfb32dfe471b55288f9bb Author: crazy <[email protected]> Date: Fri Oct 9 16:37:30 2015 +0200 pacman-g2-3.9.0-18-x86_64 * pkgrel++ * added makepkg patches from git diff --git a/source/base/pacman-g2/0001-makepkg-use-asneeded-by-default.patch b/source/base/pacman-g2/0001-makepkg-use-asneeded-by-default.patch new file mode 100644 index 0000000..71e94b0 --- /dev/null +++ b/source/base/pacman-g2/0001-makepkg-use-asneeded-by-default.patch @@ -0,0 +1,56 @@ +From 7dca17c21cb6a8ffd8fe9964812c8f0447c4ab7b Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Fri, 9 Oct 2015 05:57:51 +0200 +Subject: [PATCH 1/2] makepkg * deprecate 'asneeded' and add --as-needed to be + default... * WTF.. adding 8k lines with this option.. * use noasneeded if you + need an package to be build without + +--- + scripts/makepkg | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/scripts/makepkg b/scripts/makepkg +index d070fe0..8fff977 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -32,6 +32,7 @@ PKGDEST=$startdir + USE_COLOR="n" + + # Options ++ + BUILDSCRIPT="./FrugalBuild" + CLEANUP=0 + CLEANCACHE=0 +@@ -1342,16 +1343,23 @@ if grep -i -q "^# Compiling Time: [~0-9\.]\+ SBU$" $BUILDSCRIPT && \ + fi + fi + ++ ++if [ "`check_option ASNEEDED`" ]; then ++ error "You are using deprecated option 'asneeded'." ++ error "This is now default, please remove and retry." ++ exit 1 ++fi ++ + if [ "`check_option NOASNEEDED`" ]; then +- msg "Using --no-as-needed in LDFLAGS" ++ warning "Using --no-as-needed in LDFLAGS ( are you sure ? )" + LDFLAGS+=" -Wl,--no-as-needed" ++ export LDFLAGS + else +- if [ "`check_option ASNEEDED`" ]; then +- msg "Using --as-needed in LDFLAGS" +- LDFLAGS+=" -Wl,--as-needed" +- fi ++ msg "Using --as-needed in LDFLAGS ( default )" ++ LDFLAGS+=" -Wl,--as-needed" ++ export LDFLAGS + fi +-export LDFLAGS ++ + + # retrieve sources + msg "Retrieving Sources..." +-- +2.5.0 + diff --git a/source/base/pacman-g2/0002-makepkg-print-host-flags-in-build.patch b/source/base/pacman-g2/0002-makepkg-print-host-flags-in-build.patch new file mode 100644 index 0000000..92d113c --- /dev/null +++ b/source/base/pacman-g2/0002-makepkg-print-host-flags-in-build.patch @@ -0,0 +1,29 @@ +From 9ea6fe2e4145d2fb7bda115514824f47935e6236 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Fri, 9 Oct 2015 06:03:13 +0200 +Subject: [PATCH 2/2] makepkg * well we really want to know what C/XX/LD flags + are used * to build the package. I may be some devels are using wrong flags.. + +--- + scripts/makepkg | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/scripts/makepkg b/scripts/makepkg +index 8fff977..71859a8 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -1877,6 +1877,11 @@ elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then + fi + fi + ++msg "This package was build with:" ++msg2 "HOST_CFLAGS: $CFLAGS " ++msg2 "HOST_CXXFLAGS: $CXXFLAGS " ++msg2 "HOST_LDFLAGS: $LDFLAGS " ++ + msg "Finished making: $pkgname (`date`)" + + install_pkg +-- +2.5.0 + diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index f4ad645..e2adec6 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -10,7 +10,7 @@ USE_STABLE=${USE_STABLE:-"n"} pkgname=pacman-g2 pkgver=3.9.0 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=17 +pkgrel=18 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/"; backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -47,8 +47,10 @@ if ! Fuse $USE_DEVEL; then 0001-fix-problems-with-umounting-chroots-when-dirmngr-was.patch \ 0001-use-multithreaded-compression-and-higher-compression.patch \ 0001-killall-gpg-components-_in_-chroot.patch \ - 0001-only-kill-dirmngr.patch ) - signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '') + 0001-only-kill-dirmngr.patch \ + 0001-makepkg-use-asneeded-by-default.patch \ + 0002-makepkg-print-host-flags-in-build.patch) + signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '' '') if Fuse $USE_STABLE; then source=("${source[@]}" stable.patch) signatures=("${signatures[@]}" '') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
