Subject: pkg/18717: devel/lclint shouldn't need to use csh to build
To: None <gnats-bugs@gnats.netbsd.org>
From: Greg A. Woods <woods@weird.com>
List: netbsd-bugs
Date: 10/19/2002 15:35:36
>Number: 18717
>Category: pkg
>Synopsis: devel/lclint shouldn't need to use csh to build
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Oct 19 12:36:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Greg A. Woods
>Release: pkgsrc-current 2002/10/18
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD
>Description:
lclint shouldn't need to use csh to build
>How-To-Repeat:
rm /bin/csh
>Fix:
cvs diff: Diffing devel/lclint
Index: devel/lclint/distinfo
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/devel/lclint/distinfo,v
retrieving revision 1.4
diff -c -r1.4 distinfo
*** devel/lclint/distinfo 30 Dec 2001 13:38:06 -0000 1.4
--- devel/lclint/distinfo 11 Feb 2002 22:51:27 -0000
***************
*** 2,7 ****
SHA1 (lclint-2.5q.src.tar.gz) = 907e91d78f844c8c63a615dda477a25a74e62374
Size (lclint-2.5q.src.tar.gz) = 1573297 bytes
! SHA1 (patch-aa) = dedb20a754c687050c1dedf1f710832b416c2157
SHA1 (patch-ab) = a7015a6c0d5acad0354eb826b89774f098faaace
SHA1 (patch-ac) = 989be6f79323fe59a853565c0645ef254a8ee1f7
--- 2,7 ----
SHA1 (lclint-2.5q.src.tar.gz) = 907e91d78f844c8c63a615dda477a25a74e62374
Size (lclint-2.5q.src.tar.gz) = 1573297 bytes
! SHA1 (patch-aa) = 69d20c66a02f2a0d346012ad1062c9a76e675325
SHA1 (patch-ab) = a7015a6c0d5acad0354eb826b89774f098faaace
SHA1 (patch-ac) = 989be6f79323fe59a853565c0645ef254a8ee1f7
cvs diff: Diffing devel/lclint/patches
Index: devel/lclint/patches/patch-aa
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/devel/lclint/patches/patch-aa,v
retrieving revision 1.2
diff -c -r1.2 patch-aa
*** devel/lclint/patches/patch-aa 30 Dec 2001 13:38:07 -0000 1.2
--- devel/lclint/patches/patch-aa 11 Feb 2002 22:51:22 -0000
***************
*** 1,6 ****
$NetBSD: patch-aa,v 1.2 2001/12/30 13:38:07 wiz Exp $
! --- Makefile.in.orig Thu Jul 27 11:19:17 2000
! +++ Makefile.in Sat Dec 29 03:39:46 2001
@@ -37,10 +37,10 @@
###
--- 1,6 ----
$NetBSD: patch-aa,v 1.2 2001/12/30 13:38:07 wiz Exp $
! --- Makefile.in.orig Wed Jul 26 22:19:17 2000
! +++ Makefile.in Mon Feb 11 17:01:43 2002
@@ -37,10 +37,10 @@
###
***************
*** 14,38 ****
### directory for lclint binary
INSTALLDIR = @installdir@/bin
! @@ -160,7 +160,7 @@
! setenv LINKFLAGS '$(LINKFLAGS)' ; \
! setenv DEFAULT_LARCHPATH '".:$(LIBDIR)"' ; \
! setenv DEFAULT_LCLIMPORTDIR '"$(IMPORTSDIR)"' ; \
- $(MAKE) -e localconstants ; $(MAKE) -e
! + $(MAKE) localconstants ; $(MAKE)
! else
cd src ; CC='$(CC)'; export CC; CCOPT='$(CCOPT)'; \
BISON='$(BISON)' ; export BISON; FLEX='$(FLEX)'; export FLEX; \
! @@ -169,7 +169,7 @@
DEFAULT_LARCHPATH='".:$(LIBDIR)/"' ; export DEFAULT_LARCHPATH ;\
LINKFLAGS='$(LINKFLAGS)'; export LINK_FLAGS; \
DEFAULT_LCLIMPORTDIR='"$(IMPORTSDIR)"' ; export DEFAULT_LCLIMPORTDIR ;\
- $(MAKE) -e localconstants ; $(MAKE) -e
+ $(MAKE) localconstants ; $(MAKE)
- endif
@echo '// '
@echo '// Run: '$(MAKE)' test to check'
! @@ -227,14 +227,14 @@
dolibraries:
@echo '// Installing libraries in '$(LIBDIR)
@echo " (This will complain if the directory already exists, don't worry about it.)"
--- 14,66 ----
### directory for lclint binary
INSTALLDIR = @installdir@/bin
! @@ -78,7 +78,7 @@
! ### shell --- should work with /bin/sh or similar shells too.
! ###
!
! -SHELL = /bin/csh
! +SHELL = /bin/sh
!
! ###
! ### If you wish to install lclint in some other directory, set these
! @@ -153,15 +153,6 @@
!
! bin/lclint:
! @echo 'Building lclint from source'
! -ifeq ($(SHELL), /bin/csh)
! - cd src ; setenv CC '$(CC)' ; setenv CCOPT '$(CCOPT)'; \
! - setenv BISON '$(BISON)' ; setenv FLEX '$(FLEX)' ; \
! - setenv SYSTEM_LIBDIR '$(SYSTEM_LIBDIR)' ; \
! - setenv LINKFLAGS '$(LINKFLAGS)' ; \
! - setenv DEFAULT_LARCHPATH '".:$(LIBDIR)"' ; \
! - setenv DEFAULT_LCLIMPORTDIR '"$(IMPORTSDIR)"' ; \
- $(MAKE) -e localconstants ; $(MAKE) -e
! -else
cd src ; CC='$(CC)'; export CC; CCOPT='$(CCOPT)'; \
BISON='$(BISON)' ; export BISON; FLEX='$(FLEX)'; export FLEX; \
! DEFAULT_CPPCMD='$(DEFAULT_CPPCMD)' ; export DEFAULT_CPPCMD ;\
! @@ -169,19 +160,14 @@
DEFAULT_LARCHPATH='".:$(LIBDIR)/"' ; export DEFAULT_LARCHPATH ;\
LINKFLAGS='$(LINKFLAGS)'; export LINK_FLAGS; \
DEFAULT_LCLIMPORTDIR='"$(IMPORTSDIR)"' ; export DEFAULT_LCLIMPORTDIR ;\
- $(MAKE) -e localconstants ; $(MAKE) -e
+ -endif
+ $(MAKE) localconstants ; $(MAKE)
@echo '// '
@echo '// Run: '$(MAKE)' test to check'
! @echo '// '
! mv src/lclint bin/lclint
!
! test:
! -ifeq ($(SHELL), /bin/csh)
! - cd $(TESTDIR) ; setenv LCLINT $(RELEASEDIR)/lclint ; $(MAKE) -e
! -else
! cd $(TESTDIR) ; LCLINT=$(RELEASEDIR)/lclint ; export LCLINT ; $(MAKE) -e
! -endif
!
! clean:
! cd src; $(MAKE) clean
! @@ -227,14 +213,14 @@
dolibraries:
@echo '// Installing libraries in '$(LIBDIR)
@echo " (This will complain if the directory already exists, don't worry about it.)"
>Release-Note:
>Audit-Trail:
>Unformatted: