diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-12-17 03:43:40 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-17 03:43:40 +0000 |
commit | 8472e24b2ba3b246f60d596e56af6ffb041009b8 (patch) | |
tree | 77468461c7fb358510d572c06e95c9963d967d58 /sys-libs/pwdb | |
parent | touchup patch (diff) | |
download | historical-8472e24b2ba3b246f60d596e56af6ffb041009b8.tar.gz historical-8472e24b2ba3b246f60d596e56af6ffb041009b8.tar.bz2 historical-8472e24b2ba3b246f60d596e56af6ffb041009b8.zip |
fix install target so we dont need preplib
Package-Manager: portage-2.0.53
Diffstat (limited to 'sys-libs/pwdb')
-rw-r--r-- | sys-libs/pwdb/Manifest | 10 | ||||
-rw-r--r-- | sys-libs/pwdb/files/pwdb-0.62-build.patch | 11 | ||||
-rw-r--r-- | sys-libs/pwdb/pwdb-0.62.ebuild | 21 |
3 files changed, 30 insertions, 12 deletions
diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest index f2cded3130f9..85ee68aedacf 100644 --- a/sys-libs/pwdb/Manifest +++ b/sys-libs/pwdb/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 97c58cf064760b2aeb64c91f73e4b647 ChangeLog 3918 MD5 8cc9a65a57937cd962ff641cf94e40c3 files/digest-pwdb-0.62 61 MD5 0d0c7a6216f5cf079472dfe36ea9d71c files/passwd 143 @@ -6,3 +9,10 @@ MD5 bf4eb22a793eb0683d8c62b4677d66f8 files/pwdb-0.62-selinux.patch 10567 MD5 4f771531dffd4c3a0e43a96e8c265f1e files/pwdb-0.62-use-gcc-as-linker.patch 421 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 8dfab0867f2e426eb600b1d69fcf6fd4 pwdb-0.62.ebuild 1660 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDo4mJ2+ySkm8kpY0RAv0bAJ97kk8u1AGZSZzPlpGWTXw8mkkuwACfefTd +LbaDGHCrmMvCLuSD4O17ji8= +=ZnIP +-----END PGP SIGNATURE----- diff --git a/sys-libs/pwdb/files/pwdb-0.62-build.patch b/sys-libs/pwdb/files/pwdb-0.62-build.patch new file mode 100644 index 000000000000..4ed83a380ca9 --- /dev/null +++ b/sys-libs/pwdb/files/pwdb-0.62-build.patch @@ -0,0 +1,11 @@ +--- libpwdb/Makefile ++++ libpwdb/Makefile +@@ -69,7 +69,7 @@ + $(INSTALL) -m 644 radius.h $(INCLUDED)/radius.h + $(INSTALL) -m 644 _pwdb_macros.h $(INCLUDED)/_pwdb_macros.h + $(INSTALL) -m 755 $(LIBFILENAME) $(LIBDIR) +- $(LDCONFIG) ++ ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBSONAME) + ln -sf $(LIBFILENAME) $(LIBDIR)/$(LIBDYNAME) + $(INSTALL) -m 644 $(LIBSTATIC) $(LIBDIR) + diff --git a/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild index 25973cd01f67..965a8b4b44f5 100644 --- a/sys-libs/pwdb/pwdb-0.62.ebuild +++ b/sys-libs/pwdb/pwdb-0.62.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.21 2005/10/08 12:50:35 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.22 2005/12/17 03:43:40 vapier Exp $ inherit eutils flag-o-matic @@ -13,17 +13,17 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="selinux" -DEPEND="virtual/libc - selinux? ( sys-libs/libselinux )" +DEPEND="selinux? ( sys-libs/libselinux )" src_unpack () { unpack ${A} - cd ${S} + cd "${S}" + epatch "${FILESDIR}"/${P}-build.patch # Uses gcc as linker needed for hppa, but good idea in general. - epatch ${FILESDIR}/${P}-use-gcc-as-linker.patch + epatch "${FILESDIR}"/${P}-use-gcc-as-linker.patch - use selinux && epatch ${FILESDIR}/${P}-selinux.patch + use selinux && epatch "${FILESDIR}"/${P}-selinux.patch sed -i \ -e "s/^DIRS = .*/DIRS = libpwdb/" \ @@ -46,15 +46,12 @@ src_compile() { src_install() { dodir /$(get_libdir) /usr/$(get_libdir) /usr/include/pwdb make \ - INCLUDED=${D}/usr/include/pwdb \ - LIBDIR=${D}/$(get_libdir) \ + INCLUDED="${D}"/usr/include/pwdb \ + LIBDIR="${D}"/$(get_libdir) \ LDCONFIG="echo" \ install || die - preplib / - mv ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir) - - # See bug #4411 for more info + mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ || die gen_usr_ldscript libpwdb.so insinto /etc |