Author: glen Date: Wed Dec 30 15:03:31 2009 GMT
Module: packages Tag: OPENJDK-1_6
---- Log message:
- make jobs extraction from openoffice.org.spec
---- Files affected:
packages/openjdk:
openjdk.spec (1.8.2.3 -> 1.8.2.4)
---- Diffs:
================================================================
Index: packages/openjdk/openjdk.spec
diff -u packages/openjdk/openjdk.spec:1.8.2.3
packages/openjdk/openjdk.spec:1.8.2.4
--- packages/openjdk/openjdk.spec:1.8.2.3 Wed Dec 30 15:25:21 2009
+++ packages/openjdk/openjdk.spec Wed Dec 30 16:03:26 2009
@@ -37,8 +37,7 @@
JDK o otwartych źrodłach - implementacja platformy Java.
%prep
-%setup -q -c
-
+%setup -qc
%patch0 -p0
%build
@@ -46,11 +45,15 @@
unset CLASSPATH
LC_ALL=C
LANG=C
-HOTSPOT_BUILD_JOBS=%(_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); [ "$_NCPUS"
-gt 1 ] && echo "$(($_NCPUS * 2))")
+
+HOTSPOT_BUILD_JOBS=%(echo "%{__make}" | sed -e
's#.*-j\([[:space:]]*[0-9]\+\)#\1#g')
+[ "$HOTSPOT_BUILD_JOBS" = "%{__make}" ] && HOTSPOT_BUILD_JOBS=1
+HOTSPOT_BUILD_JOBS=$(echo $HOTSPOT_BUILD_JOBS)
+
export JAVA_HOME CLASSPATH LC_ALL LANG HOTSPOT_BUILD_JOBS
-/usr/bin/make sanity
-/usr/bin/make \
+%{__make} -j1 sanity
+%{__make} -j1 \
UTILS_USR_BIN_PATH="" \
CC="%{__cc}" \
CXX="%{__cxx}" \
@@ -64,7 +67,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-/usr/bin/make export_product \
+%{__make} export_product \
ALT_BOOTDIR=%{java_home} \
EXPORT_PATH=$RPM_BUILD_ROOT%{_prefix} \
EXPORT_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \
@@ -80,7 +83,7 @@
install -d $RPM_BUILD_ROOT{%{_javadir},%{_bindir}}
cp -a compiler/dist/lib/javac.jar
$RPM_BUILD_ROOT%{_javadir}/javac-%{version}.jar
ln -s javac-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/javac.jar
-install javac $RPM_BUILD_ROOT%{_bindir}
+install -p javac $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -98,6 +101,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8.2.4 2009/12/30 15:03:26 glen
+- make jobs extraction from openoffice.org.spec
+
Revision 1.8.2.3 2009/12/30 14:25:21 pawelz
- -jX does not work with openjdk Makefile. Use HOTSPOT_BUILD_JOBS instead.
- it %builds
@@ -107,4 +113,3 @@
Revision 1.8.2.1 2009/12/30 13:31:11 pawelz
- NFY
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openjdk/openjdk.spec?r1=1.8.2.3&r2=1.8.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
