diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-05-15 21:56:36 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-05-15 21:56:36 +0000 |
| commit | cd2d7b024ef2f584f6ac9bb387ff292bf7311bd0 (patch) | |
| tree | bbfdae2c198dc6b1196bab748f0d0d7071c4e5c3 /dev-db | |
| parent | Respect AR, CFLAGS (bug #482188). Fix building on HPPA. Remove obsolete files. (diff) | |
| download | gentoo-2-cd2d7b024ef2f584f6ac9bb387ff292bf7311bd0.tar.gz gentoo-2-cd2d7b024ef2f584f6ac9bb387ff292bf7311bd0.tar.bz2 gentoo-2-cd2d7b024ef2f584f6ac9bb387ff292bf7311bd0.zip | |
Roll two chunks into one.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/kyotocabinet/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/kyotocabinet/files/fix_configure-1.2.62.patch | 6 | ||||
| -rw-r--r-- | dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch | 11 |
3 files changed, 8 insertions, 15 deletions
diff --git a/dev-db/kyotocabinet/ChangeLog b/dev-db/kyotocabinet/ChangeLog index fa781c394a11..541d1d32263d 100644 --- a/dev-db/kyotocabinet/ChangeLog +++ b/dev-db/kyotocabinet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/kyotocabinet # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.23 2014/05/15 21:46:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/ChangeLog,v 1.24 2014/05/15 21:56:36 jer Exp $ + + 15 May 2014; Jeroen Roovers <jer@gentoo.org> + files/fix_configure-1.2.62.patch, files/kyotocabinet-1.2.76-flags.patch: + Roll two chunks into one. *kyotocabinet-1.2.76-r1 (15 May 2014) diff --git a/dev-db/kyotocabinet/files/fix_configure-1.2.62.patch b/dev-db/kyotocabinet/files/fix_configure-1.2.62.patch index 97789627e0b8..622b7fd52792 100644 --- a/dev-db/kyotocabinet/files/fix_configure-1.2.62.patch +++ b/dev-db/kyotocabinet/files/fix_configure-1.2.62.patch @@ -9,8 +9,8 @@ index 94e9d29..6999615 100644 -MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2" -MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2" -MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I/usr/local/include" -+MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0" -+MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0" ++MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char" ++MYCXXFLAGS="-Wall -fPIC -fsigned-char" +MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1" MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__" @@ -48,4 +48,4 @@ index 94e9d29..6999615 100644 -fi # Shared libraries - if test "$enable_shared" != "no" && test "$enable_profile" != "yes"
\ No newline at end of file + if test "$enable_shared" != "no" && test "$enable_profile" != "yes" diff --git a/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch b/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch index 77a6fb37791c..931e8c3f7bbe 100644 --- a/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch +++ b/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-flags.patch @@ -1,16 +1,5 @@ --- a/configure.in +++ b/configure.in -@@ -35,8 +35,8 @@ - MYPCFILES="kyotocabinet.pc" - - # Building flags --MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0" --MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0" -+MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char" -+MYCXXFLAGS="-Wall -fPIC -fsigned-char" - MYCPPFLAGS="-I. -I\$(INCLUDEDIR)" - MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1" - MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__" @@ -193,28 +193,6 @@ # Byte order AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND") |