From ca78939a82f4425e3e649bd42601043eb394be1a Mon Sep 17 00:00:00 2001 From: fake Date: Wed, 5 Jan 2005 11:40:38 +0000 Subject: [PATCH] fake: libjpeg,usbutils,traceroute,pidentd,wu-ftpd,glib12: on x86_64, the config.sub of these packages is too old to detect x86_64 as a valid target. either try autgen=1 or copy over newer files from automake. [2004122520100814575] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5401 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/pidentd/pidentd.conf | 3 +++ package/base/traceroute/traceroute.conf | 3 +++ package/base/usbutils/usbutils.conf | 4 ++++ package/base/wu-ftpd/wu-ftpd.conf | 4 ++++ package/gnome14/glib12/glib12.conf | 3 +++ package/rene/libjpeg/libjpeg.conf | 3 +++ 6 files changed, 20 insertions(+) create mode 100644 package/base/usbutils/usbutils.conf create mode 100644 package/base/wu-ftpd/wu-ftpd.conf diff --git a/package/base/pidentd/pidentd.conf b/package/base/pidentd/pidentd.conf index 3ddbf2665..af98fe40a 100644 --- a/package/base/pidentd/pidentd.conf +++ b/package/base/pidentd/pidentd.conf @@ -20,4 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +[ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ + autogen=1 + confopt="$confopt --with-des=no" diff --git a/package/base/traceroute/traceroute.conf b/package/base/traceroute/traceroute.conf index d873e6c5e..3e56dcf52 100644 --- a/package/base/traceroute/traceroute.conf +++ b/package/base/traceroute/traceroute.conf @@ -20,4 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +[ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ + preconf="cp -v $root/usr/share/automake-1.9/config.{sub,guess} ." + makeinstopt="$makeinstopt install-man" diff --git a/package/base/usbutils/usbutils.conf b/package/base/usbutils/usbutils.conf new file mode 100644 index 000000000..475891a40 --- /dev/null +++ b/package/base/usbutils/usbutils.conf @@ -0,0 +1,4 @@ + +[ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ + preconf="cp -v $root/usr/share/automake-1.9/config.{sub,guess} ." + diff --git a/package/base/wu-ftpd/wu-ftpd.conf b/package/base/wu-ftpd/wu-ftpd.conf new file mode 100644 index 000000000..7c870e231 --- /dev/null +++ b/package/base/wu-ftpd/wu-ftpd.conf @@ -0,0 +1,4 @@ + +[ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ + autogen=1 + diff --git a/package/gnome14/glib12/glib12.conf b/package/gnome14/glib12/glib12.conf index e8d3b8b51..077636d3a 100644 --- a/package/gnome14/glib12/glib12.conf +++ b/package/gnome14/glib12/glib12.conf @@ -23,3 +23,6 @@ NO_SANITY_CHECK=1 . $base/package/*/*/gnome-14.conf +[ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ + preconf="cp -v $root/usr/share/automake-1.9/config.{sub,guess} ." + diff --git a/package/rene/libjpeg/libjpeg.conf b/package/rene/libjpeg/libjpeg.conf index ac65beb6f..c47498b77 100644 --- a/package/rene/libjpeg/libjpeg.conf +++ b/package/rene/libjpeg/libjpeg.conf @@ -20,4 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +[ "$arch" = "x86" -a "$ROCKCFG_X86_BITS" = "64" ] && \ + preconf="cp -v $root/usr/share/automake-1.9/config.{sub,guess} ." + confopt="$confopt --enable-shared --enable-static"