diff options
author | Patrick Lauer <patrick@gentoo.org> | 2010-06-17 17:32:12 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2010-06-17 17:32:12 +0000 |
commit | b3d93433a4319ad1530be25e04a7cc9e857ba067 (patch) | |
tree | d8ce87ba605214fc8b73642bbe2fb034283d286d /dev-db/kyotocabinet/files | |
parent | Fixed gcc-4.5 issue, bug #320107. (diff) | |
download | gentoo-2-b3d93433a4319ad1530be25e04a7cc9e857ba067.tar.gz gentoo-2-b3d93433a4319ad1530be25e04a7cc9e857ba067.tar.bz2 gentoo-2-b3d93433a4319ad1530be25e04a7cc9e857ba067.zip |
Initial import. Ebuild by jbergstroem.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/kyotocabinet/files')
-rw-r--r-- | dev-db/kyotocabinet/files/fix_rpath.patch | 61 | ||||
-rw-r--r-- | dev-db/kyotocabinet/files/remove_docinst.patch | 13 | ||||
-rw-r--r-- | dev-db/kyotocabinet/files/remove_ldconfig.patch | 12 |
3 files changed, 86 insertions, 0 deletions
diff --git a/dev-db/kyotocabinet/files/fix_rpath.patch b/dev-db/kyotocabinet/files/fix_rpath.patch new file mode 100644 index 000000000000..a6a79384e437 --- /dev/null +++ b/dev-db/kyotocabinet/files/fix_rpath.patch @@ -0,0 +1,61 @@ +diff --git a/Makefile.in b/Makefile.in +index d2601ec..64c76c7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -53,8 +53,8 @@ CXXFLAGS = @MYCXXFLAGS@ + LDFLAGS = @MYLDFLAGS@ + CMDLDFLAGS = @MYCMDLDFLAGS@ + LIBS = @LIBS@ +-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. +-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ ++LDENV = ++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) + POSTCMD = @MYPOSTCMD@ + + +diff --git a/configure.in b/configure.in +index 3ce09c1..ae00c62 100644 +--- a/configure.in ++++ b/configure.in +@@ -32,27 +32,17 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc kyotocabinet.idl" + MYPCFILES="kyotocabinet.pc" + + # Building flags +-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -O2" ++MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char" + MYCXXFLAGS="-Wall -fPIC -fsigned-char -O2" +-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" ++MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" + MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1" + MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__" +-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" ++MYLDFLAGS="-L. -L\$(LIBDIR)" + MYCMDLDFLAGS="" + MYRUNPATH="\$(LIBDIR)" + MYLDLIBPATHENV="LD_LIBRARY_PATH" + MYPOSTCMD="true" + +-# Building paths +-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" +-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" +-CPATH="$HOME/include:/usr/local/include:$CPATH" +-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" +-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" +-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" +-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH +- +- + + #================================================================ + # Options +diff --git a/kyotocabinet.pc.in b/kyotocabinet.pc.in +index d9b67f1..8ede1a9 100644 +--- a/kyotocabinet.pc.in ++++ b/kyotocabinet.pc.in +@@ -10,5 +10,5 @@ datadir=@datadir@ + Name: Kyoto Cabinet + Description: another modern implementation of DBM + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ltokyocabinet @LIBS@ ++Libs: -L${libdir} -ltokyocabinet + Cflags: -I${includedir} diff --git a/dev-db/kyotocabinet/files/remove_docinst.patch b/dev-db/kyotocabinet/files/remove_docinst.patch new file mode 100644 index 000000000000..d04c7b362a33 --- /dev/null +++ b/dev-db/kyotocabinet/files/remove_docinst.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index a813215..eefa4eb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -117,8 +117,6 @@ install : + cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(BINDIR) + cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR) +- mkdir -p $(DESTDIR)$(DATADIR) +- cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR) + mkdir -p $(DESTDIR)$(MAN1DIR) + cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR) + mkdir -p $(DESTDIR)$(PCDIR) diff --git a/dev-db/kyotocabinet/files/remove_ldconfig.patch b/dev-db/kyotocabinet/files/remove_ldconfig.patch new file mode 100644 index 000000000000..f454c4729b59 --- /dev/null +++ b/dev-db/kyotocabinet/files/remove_ldconfig.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.in b/Makefile.in +index 64c76c7..a813215 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -123,7 +123,6 @@ install : + cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR) + mkdir -p $(DESTDIR)$(PCDIR) + cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR) +- [ "$$UID" = 0 ] && ldconfig || true + @printf '\n' + @printf '#================================================================\n' + @printf '# Thanks for using Kyoto Cabinet.\n' |