teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: remove hardcoded /usr/pkg stuff from Makefile for NetBSD! 

That means that the correct rpath dir is used now even if
/usr/pkg is there.

--HG--
extra : convert_revision : a1e1417bb9349274805426fd12676810f38a2c2e
This commit is contained in:
Juan RP 2008-10-13 00:40:57 +02:00
parent 05a7bcc95e
commit c6da43c864
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
templates/git-fix-install.diff Normal file
View File

@ -0,0 +1,15 @@
--- Makefile.orig 2008-10-13 00:36:54.000000000 +0200
+++ Makefile 2008-10-13 00:37:03.000000000 +0200
@@ -691,9 +691,9 @@ ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
NEEDS_LIBICONV = YesPlease
endif
- BASIC_CFLAGS += -I/usr/pkg/include
- BASIC_LDFLAGS += -L/usr/pkg/lib
- ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
+ #BASIC_CFLAGS += -I/usr/pkg/include
+ #BASIC_LDFLAGS += -L/usr/pkg/lib
+ #ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
endif
ifeq ($(uname_S),AIX)
NO_STRCASESTR=YesPlease

2
templates/git.tmpl
View File

@ -1,6 +1,7 @@
# Template build file for 'git".
pkgname=git
version=1.6.0.2
patch_files="$pkgname-fix-install.diff"
extract_sufx=".tar.bz2"
url=http://www.kernel.org/pub/software/scm/git
build_style=gnu_configure
@ -8,6 +9,7 @@ configure_env="CURLDIR=$PKGFS_MASTERDIR"
configure_args="--with-shell=/bin/sh --with-perl=$PKGFS_MASTERDIR/bin/perl
--with-curl --without-tcltk --with-expat"
make_cmd="$PKGFS_MASTERDIR/bin/gmake"
make_env="CURLDIR=$PKGFS_MASTERDIR"
short_desc="GIT Tree History Storage Tool"
maintainer="Daniel Horecki <morr@morr.pl>"
checksum=eb91ca256d0fbcc956f91ad02da659d9b322261d