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: 19-Jun-2007 11:09:33
Branch: HEAD Handle: 2007061910093300
Added files:
openpkg-src/jam jam.patch
Modified files:
openpkg-src/jam jam.spec
Log:
add Boost Jam (bjam) to this package, too
Summary:
Revision Changes Path
1.1 +25 -0 openpkg-src/jam/jam.patch
1.14 +44 -14 openpkg-src/jam/jam.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jam/jam.patch
============================================================================
$ cvs diff -u -r0 -r1.1 jam.patch
--- /dev/null 2007-06-19 11:08:25 +0200
+++ jam.patch 2007-06-19 11:09:33 +0200
@@ -0,0 +1,25 @@
+Index: boost-build/jam_src/build.sh
+--- boost-build/jam_src/build.sh.orig 2006-02-03 17:57:42 +0100
++++ boost-build/jam_src/build.sh 2007-06-17 13:54:31 +0200
+@@ -127,7 +127,7 @@
+ ;;
+
+ gcc)
+- BOOST_JAM_CC=gcc
++ BOOST_JAM_CC="gcc -O0"
+ ;;
+
+ darwin)
+Index: boost-build/jam_src/build.jam
+--- boost-build/jam_src/build.jam.orig 2007-06-17 14:07:34 +0200
++++ boost-build/jam_src/build.jam 2007-06-17 14:08:21 +0200
+@@ -153,7 +153,7 @@
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : "-o " : -D
+ : -pedantic
+- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
++ [ opt --release : [ opt --symbols : -g : -s ] -O0 ]
+ [ opt --debug : -g -O0 -fno-inline ]
+ -I$(--python-include) -Wno-long-long
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jam/jam.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 jam.spec
--- openpkg-src/jam/jam.spec 19 Jun 2007 08:58:19 -0000 1.13
+++ openpkg-src/jam/jam.spec 19 Jun 2007 09:09:33 -0000 1.14
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_perforce 2.5
+%define V_boost 2.0-m11
+
# package information
Name: jam
Summary: Perforce Jam
@@ -32,16 +36,18 @@
Class: PLUS
Group: Building
License: Freely distributable
-Version: 2.5
+Version: %{V_perforce}
Release: 20070619
# list of sources
-Source0: ftp://ftp.perforce.com/pub/jam/jam-%{version}.tar
+Source0: ftp://ftp.perforce.com/pub/jam/jam-%{V_perforce}.tar
+Source1:
http://switch.dl.sourceforge.net/boost/boost-build-%{V_boost}.tar.bz2
+Patch0: jam.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, bison
+BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
@@ -55,28 +61,52 @@
header file dependencies and object files both automatically and
on-the-fly.
+ This OpenPKG package contains both the original Jam from Perforce
+ (jam) and the enhanced Jam from the Boost Build system (bjam).
+
%track
- prog jam = {
- version = %{version}
+ prog jam:jam = {
+ version = %{V_perforce}
url = ftp://ftp.perforce.com/pub/jam/
regex = jam-(__VER__)\.tar
}
+ prog jam:bjam = {
+ version = %{V_boost}
+ url = http://www.boost.org/tools/build/v2/index.html
+ regex = boost-build-(__VER__)\.tar\.bz2
+ }
%prep
- %setup -q
- %{l_shtool} subst \
- -e 's;^\(CC[ ]*=\).*$;\1 %{l_cc};' \
- -e 's;^\(CFLAGS[ ]*=\).*$;\1 %{l_cflags} -O0;' \
- Makefile
+ %setup -q -c
+ %setup -q -T -D -a 1
+ %patch -p0
%build
- %{l_make} %{l_mflags -O}
+ ( cd jam-%{V_perforce}
+ %{l_shtool} subst \
+ -e 's;^\(CC[ ]*=\).*$;\1 %{l_cc};' \
+ -e 's;^\(CFLAGS[ ]*=\).*$;\1 %{l_cflags} -O0;' \
+ Makefile
+ %{l_make} %{l_mflags}
+ ) || exit $?
+ ( cd boost-build/jam_src
+ sh ./build.sh
+ ) || exit $?
%install
rm -rf $RPM_BUILD_ROOT
- BINDIR="$RPM_BUILD_ROOT%{l_prefix}/bin" ./jam0 install
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_shtool} mkdir -f -p 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/bin \
+ $RPM_BUILD_ROOT%{l_prefix}/share/jam/bjam
+ %{l_shtool} install -c -s -m 755 \
+ jam-%{V_perforce}/bin.*/jam $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -s -m 755 \
+ boost-build/jam_src/bin.*/bjam $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -m 644 \
+ boost-build/doc/html/jam/*.html
$RPM_BUILD_ROOT%{l_prefix}/share/jam/bjam/
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%doc %{l_prefix}/share/jam/bjam/*'
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
