diff options
author | skrll <skrll> | 2001-04-23 09:15:09 +0000 |
---|---|---|
committer | skrll <skrll> | 2001-04-23 09:15:09 +0000 |
commit | b2b92e7f1db106e28db8a0fb343ae7d00b962e70 (patch) | |
tree | 28f1b09d3d64ee2c2f12009ce1389f4c196d20ac /devel/cmdline | |
parent | 3123e90a107ca6f782b24e0332828ba3f781e663 (diff) | |
download | pkgsrc-b2b92e7f1db106e28db8a0fb343ae7d00b962e70.tar.gz |
Don't hardcode g++ use the c++ compiler defined in CXX. This makes libtool
happy and fixes build problems.
Noted in recent i386 bulk build.
Diffstat (limited to 'devel/cmdline')
-rw-r--r-- | devel/cmdline/distinfo | 6 | ||||
-rw-r--r-- | devel/cmdline/patches/patch-aa | 6 | ||||
-rw-r--r-- | devel/cmdline/patches/patch-as | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/devel/cmdline/distinfo b/devel/cmdline/distinfo index fa1558fa993..b4213df0422 100644 --- a/devel/cmdline/distinfo +++ b/devel/cmdline/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:14 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/04/23 09:15:09 skrll Exp $ SHA1 (cmdline-1.04/CmdLine.tar.gz) = 9d2bebc7faf8e47d69fd272367e1a4051bb81e13 Size (cmdline-1.04/CmdLine.tar.gz) = 97602 bytes -SHA1 (patch-aa) = bd63d292d016cecab220640a0b4b167dd0983f28 +SHA1 (patch-aa) = 26d46573b173b8eeeb36790a8bd9d856b34f9d4a SHA1 (patch-ab) = 65bd1db2f29e145c4eea755f17eae00795671b05 SHA1 (patch-ac) = c8381a0a19cb3c58e4d0993639385b6e45ce6920 SHA1 (patch-ad) = 7945b1e7e4637433247f0014394b1a2641629f22 @@ -20,7 +20,7 @@ SHA1 (patch-ao) = 7df8976af6f1518375f39827af730e35097d8f7d SHA1 (patch-ap) = 2c98ba538726e5d38ee407fad750add1a82b1109 SHA1 (patch-aq) = db2260067d4d2259a07d90495e1b0cf450ab67cc SHA1 (patch-ar) = 2c081b60682ce82fa5eb3eebf3885e1c23a59812 -SHA1 (patch-as) = ee1872e9389ddd4a2deeb123edc51b26525d9b7c +SHA1 (patch-as) = 8e79d13842479e7abe7ca1815d18f7f91a206f40 SHA1 (patch-at) = ef5a35d5d4472212ce742f3505698307a4bb16c3 SHA1 (patch-au) = 61be780115f3aef2897407e9a17812c94eac3837 SHA1 (patch-av) = e59f08e7fba0bad7d8cdde16f2f4775470cd5ec8 diff --git a/devel/cmdline/patches/patch-aa b/devel/cmdline/patches/patch-aa index 8e5aada16cf..eaa9c41cf3b 100644 --- a/devel/cmdline/patches/patch-aa +++ b/devel/cmdline/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2000/10/12 16:58:57 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2001/04/23 09:15:10 skrll Exp $ ---- Config.mk.orig Thu Jan 2 13:33:36 1997 +--- Config.mk.orig Thu Jan 2 18:33:36 1997 +++ Config.mk @@ -13,7 +13,7 @@ ###^^##################################################################### @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.2 2000/10/12 16:58:57 jlam Exp $ # ## name of C++ compiler -CC=CC -+CC=$(LIBTOOL) g++ ++CC=$(LIBTOOL) $(CXX) ## option to specify other include directories to search INC=-I diff --git a/devel/cmdline/patches/patch-as b/devel/cmdline/patches/patch-as index 33120adf8b9..222c2e2cf05 100644 --- a/devel/cmdline/patches/patch-as +++ b/devel/cmdline/patches/patch-as @@ -1,6 +1,6 @@ -$NetBSD: patch-as,v 1.1.1.1 2000/08/25 16:15:53 jlam Exp $ +$NetBSD: patch-as,v 1.2 2001/04/23 09:15:10 skrll Exp $ ---- src/lib/Makefile.orig Thu Jan 2 13:33:31 1997 +--- src/lib/Makefile.orig Thu Jan 2 18:33:31 1997 +++ src/lib/Makefile @@ -70,20 +70,25 @@ test: cmdtest$(EXECEXT) @@ -15,7 +15,7 @@ $NetBSD: patch-as,v 1.1.1.1 2000/08/25 16:15:53 jlam Exp $ $(RANLIB) $@ +lib$(LIBNAME).la: $(OBJS) -+ $(LIBTOOL) g++ -o lib$(LIBNAME).la $(OBJS:.o=.lo) \ ++ $(LIBTOOL) $(CXX) -o lib$(LIBNAME).la $(OBJS:.o=.lo) \ + -rpath $(PREFIX)/lib -version-info 0:0 + ### |