summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-06-24 02:47:31 +0000
committerMike Frysinger <vapier@gentoo.org>2004-06-24 02:47:31 +0000
commit9dd60c3bec25f6edf7b4837d730124594666115e (patch)
tree150666d9ab59b03d7be0f47e1787632641ea07a2 /sys-libs
parentQA - fix use invocation (Manifest recommit) (diff)
downloadgentoo-2-9dd60c3bec25f6edf7b4837d730124594666115e.tar.gz
gentoo-2-9dd60c3bec25f6edf7b4837d730124594666115e.tar.bz2
gentoo-2-9dd60c3bec25f6edf7b4837d730124594666115e.zip
fix PIC prob #52813
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libcap/ChangeLog7
-rw-r--r--sys-libs/libcap/files/1.10-python.patch9
-rw-r--r--sys-libs/libcap/libcap-1.10-r4.ebuild7
3 files changed, 13 insertions, 10 deletions
diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index df1088d986bc..a13eeff3e219 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/libcap
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.24 2004/05/03 22:19:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.25 2004/06/24 02:47:31 vapier Exp $
+
+ 23 Jun 2004; Mike Frysinger <vapier@gentoo.org> files/1.10-python.patch,
+ libcap-1.10-r4.ebuild:
+ Update the swig/python module to build with the shared objects instead of the
+ static objects so we get a PIC aware module #52813 by Joe Jezak.
03 May 2004; Michael Sterrett <mr_bones_@gentoo.org> libcap-1.10-r2.ebuild,
libcap-1.10.ebuild:
diff --git a/sys-libs/libcap/files/1.10-python.patch b/sys-libs/libcap/files/1.10-python.patch
index 7e1e77fb3881..f6c3517f68a7 100644
--- a/sys-libs/libcap/files/1.10-python.patch
+++ b/sys-libs/libcap/files/1.10-python.patch
@@ -21,15 +21,18 @@ diff -ur libcap-1.10.orig/libcap/Makefile libcap-1.10/libcap/Makefile
_makenames: _makenames.c cap_names.sed
$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-@@ -66,6 +71,12 @@
+@@ -66,6 +71,15 @@
ln -sf $(MINLIBNAME) $(MAJLIBNAME)
ln -sf $(MAJLIBNAME) $(LIBNAME).so
+libcap_wrap.c: include/sys/capability.h
+ swig -python -o libcap_wrap.c include/sys/capability.h
+
-+$(PYTHONMODNAME): $(OBJS) libcap_wrap.o
-+ $(LD) -x -shared -o $@ libcap_wrap.o $(OBJS)
++libcap_wrap.o: libcap_wrap.c
++ $(CC) $(CFLAGS) -fPIC -c $< -o $@
++
++$(PYTHONMODNAME): $(LOBJS) libcap_wrap.o
++ $(LD) -x -shared -o $@ libcap_wrap.o $(LOBJS)
+
%.o: %.c $(INCLS)
$(CC) $(CFLAGS) -c $< -o $@
diff --git a/sys-libs/libcap/libcap-1.10-r4.ebuild b/sys-libs/libcap/libcap-1.10-r4.ebuild
index e401173434c7..ebc41c9a24af 100644
--- a/sys-libs/libcap/libcap-1.10-r4.ebuild
+++ b/sys-libs/libcap/libcap-1.10-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r4.ebuild,v 1.3 2004/05/28 18:01:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r4.ebuild,v 1.4 2004/06/24 02:47:31 vapier Exp $
inherit flag-o-matic eutils
@@ -40,11 +40,6 @@ src_compile() {
append-flags -I/usr/include/python${PYTHONVER}
fi
- use pic && append-flags -fPIC
- use alpha && append-flags -fPIC
- use amd64 && append-flags -fPIC
- use hppa && append-flags -fPIC
-
emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" DEBUG="" ${myflags} || die
}