OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Oct-2006 14:27:48
Branch: HEAD Handle: 2006101213274800
Modified files:
openpkg-src/git git.spec
Log:
fix building under Linux and Solaris
Summary:
Revision Changes Path
1.25 +13 -6 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 git.spec
--- openpkg-src/git/git.spec 2 Oct 2006 15:54:02 -0000 1.24
+++ openpkg-src/git/git.spec 12 Oct 2006 12:27:48 -0000 1.25
@@ -38,7 +38,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20061002
+Release: 20061012
# list of sources
Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
@@ -49,10 +49,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, bash, gcc, make
-PreReq: OpenPKG, openpkg >= 20040130, bash, diffutils, rcs, perl,
python
-BuildPreReq: zlib, openssl, curl, expat
-PreReq: zlib, openssl, curl, expat
+BuildPreReq: OpenPKG, openpkg >= 20040130, bash, python, gcc, make
+PreReq: OpenPKG, openpkg >= 20040130, bash, python, diffutils, rcs,
perl
+BuildPreReq: zlib, openssl, curl, expat, libiconv
+PreReq: zlib, openssl, curl, expat, libiconv
AutoReq: no
AutoReqProv: no
@@ -92,9 +92,15 @@
%build
( cd git-%{V_git}
+ libs="-liconv"
+ case "%{l_platform -t}" in
+ *-linux* ) libs="$libs -ldl" ;;
+ esac
( echo "CC := %{l_cc}"
echo "ALL_CFLAGS := %{l_cflags -O} %{l_cppflags} \$(ALL_CFLAGS)"
- echo "ALL_LDFLAGS := %{l_ldflags} \$(ALL_LDFLAGS)"
+ echo "ALL_LDFLAGS := %{l_ldflags} \$(ALL_LDFLAGS) $libs"
+ echo "INSTALL = %{l_shtool} install -c"
+ echo "TAR = %{l_tar}"
echo "CURLDIR = %{l_prefix}"
echo "OPENSSLDIR = %{l_prefix}"
echo "SHELL_PATH = %{l_prefix}/bin/bash"
@@ -117,6 +123,7 @@
) || exit $?
( cd cogito-%{V_cogito}
%{l_make} %{l_mflags} install \
+ INSTALL="%{l_shtool} install" \
DESTDIR=$RPM_BUILD_ROOT \
prefix=%{l_prefix}
) || exit $?
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
