Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=ff593166a0ed7d7add97041ea266a3c6c8891521
commit ff593166a0ed7d7add97041ea266a3c6c8891521
Author: crazy <[EMAIL PROTECTED]>
Date: Sat Mar 8 13:44:40 2008 +0100
pacman-g2-3.6.8-3-i686
* prepare for rebuild / bump party ;)
* added 2 patches to update CHOST,
* first one updates configure.ac second patch is
* adding an workaround for peoples are running stable
* but uses current chroot ( eg: build servers mostly )
* moved the gcc hack from utils.sh to makepkg
diff --git a/source/base/pacman-g2/FrugalBuild
b/source/base/pacman-g2/FrugalBuild
index 63dbea0..4dec62a 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -6,11 +6,11 @@ USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=pacman-g2
pkgver=3.6.8
Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac
-pkgrel=2
+pkgrel=3
pkgdesc="A .tar.bz2 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})
-depends=('libarchive>=2.0.27' 'glibc>=2.7')
+depends=('libarchive>=2.0.27' 'glibc>=2.7' 'grep' 'util-linux-ng')
makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono' \
'asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common')
Fuse $USE_DEVEL && makedepends=([EMAIL PROTECTED] 'intltool')
@@ -21,8 +21,11 @@ _F_archive_nosort=y
up2date="lynx -dump $url/releases/ |Flasttar"
if ! Fuse $USE_DEVEL; then
source=($url/releases/$pkgname-$pkgver.tar.gz \
-
http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch)
- signatures=("$source.asc" '')
+
http://git.frugalware.org/patches/pacman-g2/65566adba960f2678f745d98fd15f3720e50d26a.patch
\
+ makepkg-move-strict-aliasing-hack-here.patch \
+ pacman-g2-CHOST-1.patch \
+ pacman-g2-CHOST-2.patch)
+ signatures=("$source.asc" '' '' '' '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
diff --git a/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch
b/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch
new file mode 100644
index 0000000..02bbeaa
--- /dev/null
+++ b/source/base/pacman-g2/makepkg-move-strict-aliasing-hack-here.patch
@@ -0,0 +1,35 @@
+From b109f0c78f46a2d54af529ceb71c69a1476b24ec Mon Sep 17 00:00:00 2001
+From: crazy <[EMAIL PROTECTED]>
+Date: Fri, 7 Mar 2008 22:54:32 +0100
+Subject: [PATCH] makepkg: move strict-aliasing hack here
+ * while we still need -fno-strict-aliasing
+ * moved the hack from util.sh ( where it never worked )
+ * to here. We can't do that from util.sh because
+ * makepkg.conf is sourced after util.sh so the *FLAGS are lost
+
+---
+ scripts/makepkg | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/makepkg b/scripts/makepkg
+index 5333002..a84c3ab 100755
+--- a/scripts/makepkg
++++ b/scripts/makepkg
+@@ -114,6 +114,14 @@ Fextract() {
+ # makepkg configuration
+ [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf
+
++# we need -fno-strict-aliasing for gcc 4.2*++
++_gccver=`type -p gcc >/dev/null && gcc -dumpversion`
++if [ "${_gccver%%.?}" == "4.3" ]; then
++ export CFLAGS="$CFLAGS -fno-strict-aliasing"
++ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
++fi
++
++
+ INFAKEROOT=
+ if [ "$1" = "-F" ]; then
+ INFAKEROOT=1
+--
+1.5.4.3
+
diff --git a/source/base/pacman-g2/pacman-g2-CHOST-1.patch
b/source/base/pacman-g2/pacman-g2-CHOST-1.patch
new file mode 100644
index 0000000..4435268
--- /dev/null
+++ b/source/base/pacman-g2/pacman-g2-CHOST-1.patch
@@ -0,0 +1,72 @@
+From d60831f10df7969ca4bc5d3aade7be99a9caa949 Mon Sep 17 00:00:00 2001
+From: crazy <[EMAIL PROTECTED]>
+Date: Fri, 7 Mar 2008 23:03:57 +0100
+Subject: [PATCH] configure.ac
+ * prepare for bump party ;)
+ * changed CHOST to ${CARCH}-frugalware-linux
+
+---
+ configure.ac | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac2d49b..936dde1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,7 @@ case "$host" in
+ CARCH="i686"
+ CARCHFLAGS="i686"
+ MARCHFLAG="march"
+- CHOST="${host}"
++ CHOST="${CARCH}-frugalware-linux"
+ ;;
+ x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture])
+ AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture])
+@@ -104,7 +104,7 @@ case "$host" in
+ CARCH="x86_64"
+ CARCHFLAGS="k8"
+ MARCHFLAG="march"
+- CHOST="${host}"
++ CHOST="${CARCH}-frugalware-linux"
+ ;;
+ ia64-*) AC_DEFINE_UNQUOTED([CARCH], ["ia64"], [Architecture])
+ AC_DEFINE_UNQUOTED([CARCHFLAGS], ["ia64"], [Architecture])
+@@ -112,7 +112,7 @@ case "$host" in
+ CARCH="ia64"
+ CARCHFLAGS="ia64"
+ MARCHFLAG="march"
+- CHOST="${host}"
++ CHOST="${CARCH}-frugalware-linux"
+ ;;
+ sparc-*) AC_DEFINE_UNQUOTED([CARCH], ["sparc"], [Architecture])
+ AC_DEFINE_UNQUOTED([CARCHFLAGS], ["v9"], [Architecture])
+@@ -120,7 +120,7 @@ case "$host" in
+ CARCH="sparc"
+ CARCHFLAGS="v9"
+ MARCHFLAG="mcpu"
+- CHOST="${host}"
++ CHOST="${CARCH}-frugalware-linux"
+ ;;
+ ppc-* | powerpc-*)
+ AC_DEFINE_UNQUOTED([CARCH], ["ppc"], [Architecture])
+@@ -129,7 +129,7 @@ case "$host" in
+ CARCH="ppc"
+ CARCHFLAGS="750"
+ MARCHFLAG="mcpu"
+- CHOST="${host}"
++ CHOST="${CARCH}-frugalware-linux"
+ ;;
+ i386-*) AC_DEFINE_UNQUOTED([CARCH], ["i386"], [Architecture])
+ AC_DEFINE_UNQUOTED([CARCHFLAGS], ["i386"], [Architecture])
+@@ -137,7 +137,7 @@ case "$host" in
+ CARCH="i386"
+ CARCHFLAGS="i386"
+ MARCHFLAG="march"
+- CHOST="${host}"
++ CHOST="${CARCH}-frugalware-linux"
+ ;;
+ *)
+ AC_MSG_ERROR([Your architecture is not supported])
+--
+1.5.4.3
+
diff --git a/source/base/pacman-g2/pacman-g2-CHOST-2.patch
b/source/base/pacman-g2/pacman-g2-CHOST-2.patch
new file mode 100644
index 0000000..e98968b
--- /dev/null
+++ b/source/base/pacman-g2/pacman-g2-CHOST-2.patch
@@ -0,0 +1,18 @@
+diff --git a/scripts/makepkg b/scripts/makepkg
+index a84c3ab..23d4924 100755
+--- a/scripts/makepkg
++++ b/scripts/makepkg
+@@ -114,6 +114,13 @@ Fextract() {
+ # makepkg configuration
+ [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf
+
++## both are hacks , remove after 0.9 and move to makepkg.conf
++
++if `$ECHO $CHOST|grep -q linux-gnu`; then
++ unset CHOST
++ export CHOST="`arch`-frugalware-linux"
++fi
++
+ # we need -fno-strict-aliasing for gcc 4.2*++
+ _gccver=`type -p gcc >/dev/null && gcc -dumpversion`
+ if [ "${_gccver%%.?}" == "4.3" ]; then
diff --git a/source/base/pacman-g2/pacman-g2.install
b/source/base/pacman-g2/pacman-g2.install
index 6d2a8df..ee32082 100644
--- a/source/base/pacman-g2/pacman-g2.install
+++ b/source/base/pacman-g2/pacman-g2.install
@@ -28,6 +28,17 @@ post_upgrade()
mv /var/lib/pacman{,-g2}
ln -s pacman-g2 /var/lib/pacman
fi
+
+ ## sed in makepkg.* to cover conf.xxx files
+ PARCH=`arch`
+ if grep -q linux-gnu /etc/makepkg.conf*; then
+ if [ "$PARCH" = "i686" ]; then
+ sed -i -e 's/i686-pc-linux-gnu/i686-frugalware-linux/g'
/etc/makepkg.conf*
+ else
+ sed -i -e
's/x86_64-unknown-linux-gnu/x86_64-frugalware-linux/g' /etc/makepkg.conf*
+ fi
+ ## yeah I know ppc but ..
+ fi
}
op=$1
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
