diff options
author | minskim <minskim@pkgsrc.org> | 2005-10-29 15:33:35 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2005-10-29 15:33:35 +0000 |
commit | b9f1442ba83d2fb0bff0a16beedd8cbcf9287978 (patch) | |
tree | fb56d90f88540c2115f48db82669770a345789d4 /databases | |
parent | f6a32ffff7c5d151dff2c13ce5d35153dc15d5e9 (diff) | |
download | pkgsrc-b9f1442ba83d2fb0bff0a16beedd8cbcf9287978.tar.gz |
Honor CFLAGS and LDFLAGS.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/qdbm/Makefile | 6 | ||||
-rw-r--r-- | databases/qdbm/distinfo | 4 | ||||
-rw-r--r-- | databases/qdbm/patches/patch-aa | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile index 7c6eaca19d2..e315474208a 100644 --- a/databases/qdbm/Makefile +++ b/databases/qdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/23 19:01:56 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2005/10/29 15:33:35 minskim Exp $ # DISTNAME= qdbm-1.8.33 @@ -22,8 +22,8 @@ TEST_TARGET= check CONFIGURE_ARGS+= --without-pthread .else CONFIGURE_ARGS+= --enable-pthread -CONFIGURE_ENV+= CFLAGS=${PTHREAD_CFLAGS:Q} -CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LDFLAGS:Q} +CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LDFLAGS} SUBST_CLASSES+= pthread SUBST_STAGE.pthread= pre-configure SUBST_FILES.pthread= configure diff --git a/databases/qdbm/distinfo b/databases/qdbm/distinfo index 4634117abc3..8c57d7efc74 100644 --- a/databases/qdbm/distinfo +++ b/databases/qdbm/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/10/23 19:01:56 minskim Exp $ +$NetBSD: distinfo,v 1.2 2005/10/29 15:33:35 minskim Exp $ SHA1 (qdbm-1.8.33.tar.gz) = cac04ceb3b10b024cd3d34af4984643247e54141 RMD160 (qdbm-1.8.33.tar.gz) = 28f74519675ed711132e8d0556b0520c56abef4c Size (qdbm-1.8.33.tar.gz) = 863217 bytes -SHA1 (patch-aa) = 80512f7eab71eba068c84bb227c2c2306f6ce309 +SHA1 (patch-aa) = bc1a7c486e47c3137108fad4304c000d26a907f9 diff --git a/databases/qdbm/patches/patch-aa b/databases/qdbm/patches/patch-aa index e2c4a10f2c5..7b8861be771 100644 --- a/databases/qdbm/patches/patch-aa +++ b/databases/qdbm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/10/23 19:01:56 minskim Exp $ +$NetBSD: patch-aa,v 1.2 2005/10/29 15:33:35 minskim Exp $ ---- Makefile.in.orig 2005-09-01 04:19:56.000000000 +0900 +--- Makefile.in.orig 2005-08-31 12:19:56.000000000 -0700 +++ Makefile.in @@ -45,13 +45,13 @@ MYLIBDIR = @libdir@ MYBINDIR = @bindir@ @@ -18,12 +18,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/10/23 19:01:56 minskim Exp $ CPPFLAGS = -I$(srcdir) -I$(HOME)/include -I/usr/local/include @MYDEFS@ \ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ -@@ -59,7 +59,7 @@ CPPFLAGS = -I$(srcdir) -I$(HOME)/include +@@ -59,8 +59,8 @@ CPPFLAGS = -I$(srcdir) -I$(HOME)/include CFLAGS = -Wall -ansi -pedantic -fPIC -fsigned-char $(RELCFLAGS) LD = @LD@ LIBS = -lqdbm @LIBS@ -LIBLDFLAGS = -L. -L$(HOME)/lib -L/usr/local/lib @LIBS@ -+LIBLDFLAGS = $(PTHREAD_LDFLAGS) -L. -L$(HOME)/lib -L/usr/local/lib @LIBS@ - LDFLAGS = -L. -L$(HOME)/lib -L/usr/local/lib $(LIBS) +-LDFLAGS = -L. -L$(HOME)/lib -L/usr/local/lib $(LIBS) ++LIBLDFLAGS = @LDFLAGS@ -L. -L$(HOME)/lib -L/usr/local/lib @LIBS@ ++LDFLAGS = @LDFLAGS@ -L. -L$(HOME)/lib -L/usr/local/lib $(LIBS) LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR) AR = @AR@ + ARFLAGS = rcsv |