summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-08-17 17:40:07 +0000
committerMike Frysinger <vapier@gentoo.org>2008-08-17 17:40:07 +0000
commitcc9e5723f1fb9e65bbc6ac50840411ea110a7913 (patch)
tree0717ebb57851fcc63f093a75584d4adf6912c638 /sys-apps/pciutils/files
parentVersion bump and remove pointless CFLAGS #232766. (diff)
downloadhistorical-cc9e5723f1fb9e65bbc6ac50840411ea110a7913.tar.gz
historical-cc9e5723f1fb9e65bbc6ac50840411ea110a7913.tar.bz2
historical-cc9e5723f1fb9e65bbc6ac50840411ea110a7913.zip
Respect LDFLAGS #233314 by Arfrever Frehtes Taifersar Arahesis and build on bsd #218555 by Alexis Ballier.
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26.2 x86_64
Diffstat (limited to 'sys-apps/pciutils/files')
-rw-r--r--sys-apps/pciutils/files/pciutils-3.0.0-build.patch11
-rw-r--r--sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch44
2 files changed, 55 insertions, 0 deletions
diff --git a/sys-apps/pciutils/files/pciutils-3.0.0-build.patch b/sys-apps/pciutils/files/pciutils-3.0.0-build.patch
new file mode 100644
index 000000000000..f1735a0e4ce6
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.0.0-build.patch
@@ -0,0 +1,11 @@
+--- lib/Makefile
++++ lib/Makefile
+@@ -52,7 +52,7 @@
+ else
+ CFLAGS += -fPIC -fvisibility=hidden
+ $(PCILIB): $(addsuffix .o,$(OBJS))
+- $(CC) -shared $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS)
++ $(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS)
+ endif
+
+ $(PCILIBPC): libpci.pc.in
diff --git a/sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch b/sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch
new file mode 100644
index 000000000000..e57c354db69e
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.0.0-resolv.patch
@@ -0,0 +1,44 @@
+http://bugs.gentoo.org/218555
+
+From 28ef4182c8ce8070008275e3c8f854ee5e27bce2 Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Mon, 16 Jun 2008 23:44:15 +0200
+Subject: [PATCH] dont try to link to libresolv on freebsd, needed functions are in the libc
+
+---
+ lib/configure | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/lib/configure b/lib/configure
+index d855a3c..024878a 100755
+--- a/lib/configure
++++ b/lib/configure
+@@ -48,6 +48,8 @@ echo >$m 'WITH_LIBS='
+
+ echo_n "Looking for access methods..."
+
++RESOLVLIB="-lresolv"
++
+ case $sys in
+ linux*)
+ echo_n " sysfs proc"
+@@ -80,6 +82,7 @@ case $sys in
+ echo_n " fbsd-device"
+ echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
+ echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
++ RESOLVLIB=""
+ ;;
+ openbsd)
+ echo_n " obsd-device"
+@@ -148,7 +151,7 @@ fi
+ if [ "$DNS" = yes ] ; then
+ echo >>$c "#define PCI_USE_DNS"
+ echo >>$c "#define PCI_ID_DOMAIN \"pci.id.ucw.cz\""
+- echo >>$m 'WITH_LIBS+=-lresolv'
++ echo >>$m "WITH_LIBS+=$RESOLVLIB"
+ fi
+
+ echo "Checking whether to build a shared library... $SHARED (set manually)"
+--
+1.5.5.4
+