diff options
| author | salo <salo> | 2004-05-31 19:09:46 +0000 |
|---|---|---|
| committer | salo <salo> | 2004-05-31 19:09:46 +0000 |
| commit | a4cdda0d767edf8d48889f3b7f54a727e5c1e740 (patch) | |
| tree | a90314d942e09667c8e2aa60e784fc271066d669 | |
| parent | 1d49e01dc9c4a52ccf1690c3f17eb3cde5c1ed2c (diff) | |
| download | pkgsrc-a4cdda0d767edf8d48889f3b7f54a727e5c1e740.tar.gz | |
Obey CXXFLAGS, pass more buildlink variables.
| -rw-r--r-- | devel/libebml/Makefile | 5 | ||||
| -rw-r--r-- | devel/libebml/distinfo | 4 | ||||
| -rw-r--r-- | devel/libebml/patches/patch-aa | 33 |
3 files changed, 32 insertions, 10 deletions
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile index c79d3c517ef..f1fb4b2eda7 100644 --- a/devel/libebml/Makefile +++ b/devel/libebml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/05/31 16:47:48 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2004/05/31 19:09:46 salo Exp $ # DISTNAME= libebml-0.7.0 @@ -16,7 +16,8 @@ USE_GNU_TOOLS+= make USE_LANGUAGES= c++ NO_CONFIGURE= yes -MAKEFLAGS+= prefix="${PREFIX}" +MAKEFLAGS+= prefix=${PREFIX:Q} +MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q} BUILD_DIRS= ${WRKDIR}/${DISTNAME}/make/linux ONLY_FOR_COMPILER= gcc diff --git a/devel/libebml/distinfo b/devel/libebml/distinfo index 09aa0b76dad..a368e4f5cfd 100644 --- a/devel/libebml/distinfo +++ b/devel/libebml/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2004/05/16 09:48:13 grant Exp $ +$NetBSD: distinfo,v 1.4 2004/05/31 19:09:46 salo Exp $ SHA1 (libebml-0.7.0.tar.gz) = 80b9b2bb181c44bbd7d92979731dc379bb014ef0 Size (libebml-0.7.0.tar.gz) = 58316 bytes -SHA1 (patch-aa) = 6970afa8ce52ffb9f39f663e5f2e6a562df212d8 +SHA1 (patch-aa) = 09916bb9908a9ce2ee9474dec80970ab960da826 diff --git a/devel/libebml/patches/patch-aa b/devel/libebml/patches/patch-aa index 9eae7a21184..bc602054492 100644 --- a/devel/libebml/patches/patch-aa +++ b/devel/libebml/patches/patch-aa @@ -1,13 +1,34 @@ -$NetBSD: patch-aa,v 1.3 2004/05/16 09:48:13 grant Exp $ +$NetBSD: patch-aa,v 1.4 2004/05/31 19:09:46 salo Exp $ ---- make/linux/Makefile.orig 2004-01-05 22:24:30.000000000 +1100 -+++ make/linux/Makefile -@@ -21,7 +21,7 @@ DEP=$(CXX) -MM +--- make/linux/Makefile.orig 2004-01-05 12:24:30.000000000 +0100 ++++ make/linux/Makefile 2004-05-31 21:02:39.000000000 +0200 +@@ -15,13 +15,13 @@ + includedir=$(prefix)/include/ebml + + # Programs +-CXX=g++ +-LD=g++ ++#CXX=g++ ++LD=$(CXX) + DEP=$(CXX) -MM DEPEND = makedepend - AR = ar rcvu - RANLIB = ranlib +-AR = ar rcvu +-RANLIB = ranlib -INSTALL = install ++AR += rcvu ++#RANLIB = ranlib +INSTALL = $(BSD_INSTALL) INSTALL_OPTS = -m 644 INSTALL_OPTS_LIB = -m 644 INSTALL_DIR_OPTS = -m 755 +@@ -32,8 +32,8 @@ + ifeq (yes,$(DEBUG)) + DEBUGFLAGS=-g -DDEBUG + endif +-CXXFLAGS=$(DEBUGFLAGS) -Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow +-LDFLAGS=-L. ++CXXFLAGS += $(DEBUGFLAGS) -Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow ++LDFLAGS += -L. + + CWD=$(shell pwd) + |