Skip to content

Commit

Permalink
dev-db/qdbm: update patches
Browse files Browse the repository at this point in the history 
Package-Manager: Portage-2.3.3, Repoman-2.3.1
  • Loading branch information
@hattya
hattya committed Mar 30, 2017
1 parent 6482af8 commit bbde584
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 44 deletions.
24 changes: 18 additions & 6 deletions dev-db/qdbm/files/qdbm-perl.patch
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
diff -ur qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in
--- qdbm-1.8.62.orig/perl/Makefile.in
+++ qdbm-1.8.62/perl/Makefile.in
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -25,10 +25,10 @@
DESTDIR =

# Building binaries
-CC = gcc
+CC = @CC@
INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
OPTIMIZE = -O2
-LD = gcc
+LD = @CC@
LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib

@@ -42,15 +42,15 @@
all :
cd depot && [ -f Makefile ] || \
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
$(RUNENV) make
cd curia && [ -f Makefile ] || \
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
$(RUNENV) make
cd villa && [ -f Makefile ] || \
$(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
+ LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
$(RUNENV) make
@printf '\n'
@printf '#================================================================\n'
56 changes: 33 additions & 23 deletions dev-db/qdbm/files/qdbm-ruby19.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- qdbm-1.8.78.orig/ruby/Makefile.in
+++ qdbm-1.8.78/ruby/Makefile.in
--- a/ruby/Makefile.in
+++ b/ruby/Makefile.in
@@ -85,27 +85,27 @@
sync ; sync
cd depot && rm -rf casket
Expand Down Expand Up @@ -37,17 +37,28 @@
cd villa && rm -rf casket
@printf '\n'
@printf '#================================================================\n'
--- qdbm-1.8.78.orig/ruby/curia/mod_curia.c
+++ qdbm-1.8.78/ruby/curia/mod_curia.c
--- a/ruby/configure.in
+++ b/ruby/configure.in
@@ -17,7 +17,7 @@
# Setting the default prefix
if test "$prefix" = NONE
then
- prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
+ prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
fi

# Duplication of QDBM for Ruby
--- a/ruby/curia/mod_curia.c
+++ b/ruby/curia/mod_curia.c
@@ -24,6 +24,13 @@

#define MAXOPEN 1024

+#ifndef StringValuePtr
+# define StringValuePtr(v) STR2CSTR(v)
+# define StringValuePtr(v) STR2CSTR(v)
+#endif
+#ifndef RSTRING_LEN
+# define RSTRING_LEN(s) (RSTRING(s)->len)
+# define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+

Expand Down Expand Up @@ -110,8 +121,8 @@
curia = crtable[index];
if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){
if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
--- qdbm-1.8.78.orig/ruby/curia/rbcrtest
+++ qdbm-1.8.78/ruby/curia/rbcrtest
--- a/ruby/curia/rbcrtest
+++ b/ruby/curia/rbcrtest
@@ -21,7 +21,7 @@

# main routine
Expand All @@ -130,18 +141,17 @@
exit(main())


Only in qdbm-1.8.78/ruby/depot: mkmf.log
--- qdbm-1.8.78.orig/ruby/depot/mod_depot.c
+++ qdbm-1.8.78/ruby/depot/mod_depot.c
--- a/ruby/depot/mod_depot.c
+++ b/ruby/depot/mod_depot.c
@@ -23,6 +23,13 @@

#define MAXOPEN 1024

+#ifndef StringValuePtr
+# define StringValuePtr(v) STR2CSTR(v)
+# define StringValuePtr(v) STR2CSTR(v)
+#endif
+#ifndef RSTRING_LEN
+# define RSTRING_LEN(s) (RSTRING(s)->len)
+# define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+

Expand Down Expand Up @@ -204,8 +214,8 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log
depot = dptable[index];
if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){
if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
--- qdbm-1.8.78.orig/ruby/depot/rbdptest
+++ qdbm-1.8.78/ruby/depot/rbdptest
--- a/ruby/depot/rbdptest
+++ b/ruby/depot/rbdptest
@@ -21,7 +21,7 @@

# main routine
Expand All @@ -224,8 +234,8 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log
exit(main())


--- qdbm-1.8.78.orig/ruby/myrbdoc
+++ qdbm-1.8.78/ruby/myrbdoc
--- a/ruby/myrbdoc
+++ b/ruby/myrbdoc
@@ -186,7 +186,7 @@


Expand All @@ -235,17 +245,17 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log
exit(main())


--- qdbm-1.8.78.orig/ruby/villa/mod_villa.c
+++ qdbm-1.8.78/ruby/villa/mod_villa.c
--- a/ruby/villa/mod_villa.c
+++ b/ruby/villa/mod_villa.c
@@ -25,6 +25,13 @@

#define MAXOPEN 1024

+#ifndef StringValuePtr
+# define StringValuePtr(v) STR2CSTR(v)
+# define StringValuePtr(v) STR2CSTR(v)
+#endif
+#ifndef RSTRING_LEN
+# define RSTRING_LEN(s) (RSTRING(s)->len)
+# define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+

Expand Down Expand Up @@ -341,8 +351,8 @@ Only in qdbm-1.8.78/ruby/depot: mkmf.log
FIXNUM_P(vcpmode);
cpmode = FIX2INT(vcpmode);
villa = vltable[index];
--- qdbm-1.8.78.orig/ruby/villa/rbvltest
+++ qdbm-1.8.78/ruby/villa/rbvltest
--- a/ruby/villa/rbvltest
+++ b/ruby/villa/rbvltest
@@ -21,7 +21,7 @@

# main routine
Expand Down
24 changes: 9 additions & 15 deletions dev-db/qdbm/files/qdbm-runpath.patch
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
diff -ur qdbm-1.8.77.orig/Makefile.in qdbm-1.8.77/Makefile.in
--- qdbm-1.8.77.orig/Makefile.in
+++ qdbm-1.8.77/Makefile.in
@@ -61,7 +61,7 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,6 @@
LIBS = -lqdbm @LIBS@
LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+LDENV =
AR = @AR@
ARFLAGS = rcsv
RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
diff -urN qdbm-1.8.77.orig/cgi/Makefile.in qdbm-1.8.77/cgi/Makefile.in
--- qdbm-1.8.77.orig/cgi/Makefile.in 2006-08-24 11:55:12.000000000 +0900
+++ qdbm-1.8.77/cgi/Makefile.in 2007-12-15 22:02:43.804668256 +0900
@@ -28,7 +28,7 @@
--- a/cgi/Makefile.in
+++ b/cgi/Makefile.in
@@ -28,7 +28,6 @@
CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
LIBS = -lqdbm @LIBS@
LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
+LDENV =

# Install destinations
prefix = @prefix@
diff -urN qdbm-1.8.77.orig/plus/Makefile.in qdbm-1.8.77/plus/Makefile.in
--- qdbm-1.8.77.orig/plus/Makefile.in 2007-03-07 11:44:27.000000000 +0900
+++ qdbm-1.8.77/plus/Makefile.in 2007-12-15 22:02:32.976636806 +0900
@@ -51,7 +51,7 @@
--- a/plus/Makefile.in
+++ b/plus/Makefile.in
@@ -51,7 +51,6 @@
-L$(HOME)/lib -L/usr/local/lib $(LIBS)
LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
-L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+LDENV =
AR = @AR@
ARFLAGS = rcsv
RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib

0 comments on commit bbde584

Please sign in to comment.