[CVS] OpenPKG: openpkg-src/jam/ jam.patch jam.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Mar-2009 10:36:43
Branch: HEAD Handle: 2009032709364200
Modified files:
openpkg-src/jam jam.patch jam.spec
Log:
modifying package: jam-2.5 20080806 - 20090327
Summary:
RevisionChanges Path
1.3 +6 -6 openpkg-src/jam/jam.patch
1.21+2 -2 openpkg-src/jam/jam.spec
patch -p0 '@@ .'
Index: openpkg-src/jam/jam.patch
$ cvs diff -u -r1.2 -r1.3 jam.patch
--- openpkg-src/jam/jam.patch 6 Aug 2008 07:44:06 - 1.2
+++ openpkg-src/jam/jam.patch 27 Mar 2009 09:36:42 - 1.3
@@ -1,6 +1,6 @@
-Index: boost-jam-3.1.16/build.jam
boost-jam-3.1.16/build.jam.orig 2007-12-03 04:27:54 +0100
-+++ boost-jam-3.1.16/build.jam 2008-08-06 09:39:12 +0200
+Index: boost-jam-3.1.17/build.jam
+--- boost-jam-3.1.17/build.jam.orig 2007-12-03 04:27:54 +0100
boost-jam-3.1.17/build.jam 2008-08-06 09:39:12 +0200
@@ -176,7 +176,7 @@
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : -o : -D
@@ -10,9 +10,9 @@
[ opt --debug : -g -O0 -fno-inline ]
-I$(--python-include) -I$(--extra-include) -Wno-long-long
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-Index: boost-jam-3.1.16/build.sh
boost-jam-3.1.16/build.sh.orig 2007-12-03 04:27:54 +0100
-+++ boost-jam-3.1.16/build.sh2008-08-06 09:38:28 +0200
+Index: boost-jam-3.1.17/build.sh
+--- boost-jam-3.1.17/build.sh.orig 2007-12-03 04:27:54 +0100
boost-jam-3.1.17/build.sh2008-08-06 09:38:28 +0200
@@ -129,7 +129,7 @@
;;
@@ .
patch -p0 '@@ .'
Index: openpkg-src/jam/jam.spec
$ cvs diff -u -r1.20 -r1.21 jam.spec
--- openpkg-src/jam/jam.spec 6 Aug 2008 07:44:06 - 1.20
+++ openpkg-src/jam/jam.spec 27 Mar 2009 09:36:42 - 1.21
@@ -23,7 +23,7 @@
# package version
%define V_perforce 2.5
-%define V_boost 3.1.16
+%define V_boost 3.1.17
%define V_freetype 2.5.3rc2
# package information
@@ -37,7 +37,7 @@
Group:Building
License: Freely distributable
Version: %{V_perforce}
-Release: 20080806
+Release: 20090327
# list of sources
Source0: ftp://ftp.perforce.com/jam/jam-%{V_perforce}.tar
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/jam/ jam.patch jam.spec
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: 06-Aug-2008 09:44:06
Branch: HEAD Handle: 2008080608440600
Modified files:
openpkg-src/jam jam.patch jam.spec
Log:
modifying package: jam-2.5 20080404 - 20080806
Summary:
RevisionChanges Path
1.2 +16 -17 openpkg-src/jam/jam.patch
1.20+11 -16 openpkg-src/jam/jam.spec
patch -p0 '@@ .'
Index: openpkg-src/jam/jam.patch
$ cvs diff -u -r1.1 -r1.2 jam.patch
--- openpkg-src/jam/jam.patch 19 Jun 2007 09:09:33 - 1.1
+++ openpkg-src/jam/jam.patch 6 Aug 2008 07:44:06 - 1.2
@@ -1,7 +1,19 @@
-Index: boost-build/jam_src/build.sh
boost-build/jam_src/build.sh.orig2006-02-03 17:57:42 +0100
-+++ boost-build/jam_src/build.sh 2007-06-17 13:54:31 +0200
-@@ -127,7 +127,7 @@
+Index: boost-jam-3.1.16/build.jam
+--- boost-jam-3.1.16/build.jam.orig 2007-12-03 04:27:54 +0100
boost-jam-3.1.16/build.jam 2008-08-06 09:39:12 +0200
+@@ -176,7 +176,7 @@
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : -o : -D
+ : -pedantic -fno-strict-aliasing
+-[ opt --release : [ opt --symbols : -g : -s ] -O3 ]
++[ opt --release : [ opt --symbols : -g : -s ] -O0 ]
+ [ opt --debug : -g -O0 -fno-inline ]
+ -I$(--python-include) -I$(--extra-include) -Wno-long-long
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+Index: boost-jam-3.1.16/build.sh
+--- boost-jam-3.1.16/build.sh.orig 2007-12-03 04:27:54 +0100
boost-jam-3.1.16/build.sh2008-08-06 09:38:28 +0200
+@@ -129,7 +129,7 @@
;;
gcc)
@@ -10,16 +22,3 @@
;;
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.jam2007-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.19 -r1.20 jam.spec
--- openpkg-src/jam/jam.spec 4 Apr 2008 16:42:32 - 1.19
+++ openpkg-src/jam/jam.spec 6 Aug 2008 07:44:06 - 1.20
@@ -23,7 +23,7 @@
# package version
%define V_perforce 2.5
-%define V_boost 2.0-m12
+%define V_boost 3.1.16
%define V_freetype 2.5.3rc2
# package information
@@ -37,11 +37,11 @@
Group:Building
License: Freely distributable
Version: %{V_perforce}
-Release: 20080404
+Release: 20080806
# list of sources
-Source0: ftp://ftp.perforce.com/pub/jam/jam-%{V_perforce}.tar
-Source1:
http://switch.dl.sourceforge.net/boost/boost-build-%{V_boost}.tar.bz2
+Source0: ftp://ftp.perforce.com/jam/jam-%{V_perforce}.tar
+Source1: http://switch.dl.sourceforge.net/boost/boost-jam-%{V_boost}.tgz
Source2: http://david.freetype.org/jam/ftjam-%{V_freetype}.tar.bz2
Patch0: jam.patch
@@ -69,13 +69,13 @@
%track
prog jam:jam = {
version = %{V_perforce}
-url = ftp://ftp.perforce.com/pub/jam/
+url = ftp://ftp.perforce.com/jam/
regex = jam-(__VER__)\.tar
}
prog jam:bjam = {
version = %{V_boost}
-url = http://www.boost.org/doc/tools/build/index.html
-regex = boost-build-(__VER__)\.tar\.bz2
+url = http://prdownloads.sourceforge.net/boost/
+regex = boost-jam-(__VER__)\.tgz
}
prog jam:ftjam = {
version = %{V_freetype}
@@ -97,7 +97,7 @@
Makefile
%{l_make} %{l_mflags}
) || exit $?
-( cd boost-build/jam_src
+( cd boost-jam-%{V_boost}
sh ./build.sh
) || exit $?
( cd ftjam-%{V_freetype}
@@ -111,19 +111,14 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p 755 \
-$RPM_BUILD_ROOT%{l_prefix}/bin \
-$RPM_BUILD_ROOT%{l_prefix}/share/jam/bjam
+$RPM_BUILD_ROOT%{l_prefix}/bin
%{l_shtool} install -c -s -m 755 \
[CVS] OpenPKG: openpkg-src/jam/ jam.patch jam.spec
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:
RevisionChanges 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.orig2006-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.jam2007-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 - 1.13
+++ openpkg-src/jam/jam.spec 19 Jun 2007 09:09:33 - 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 21 || 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 \
+
