RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Sep-2014 04:08:18
Branch: rpm-5_4 Handle: 2014091702081700
Modified files: (Branch: rpm-5_4)
rpm CHANGES devtool.conf
Log:
- java: bsh-2.0b5.jar in a linux jdk1.7.0_03 JVM using JNI embedding.
Summary:
Revision Changes Path
1.3501.2.441+1 -0 rpm/CHANGES
2.365.2.99 +6 -1 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.440 -r1.3501.2.441 CHANGES
--- rpm/CHANGES 14 Sep 2014 05:21:08 -0000 1.3501.2.440
+++ rpm/CHANGES 17 Sep 2014 02:08:17 -0000 1.3501.2.441
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+ - jbj: java: bsh-2.0b5.jar in a linux jdk1.7.0_03 JVM using JNI
embedding.
- jbj: rpmdav: handle NE_REDIRECT, take #1.
- jbj: rpmio: use funopen(3) on *BSD when available (untested).
- jbj: rpmct: add %{copy foo bar:} embedding.
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.98 -r2.365.2.99 devtool.conf
--- rpm/devtool.conf 5 Sep 2014 19:46:47 -0000 2.365.2.98
+++ rpm/devtool.conf 17 Sep 2014 02:08:17 -0000 2.365.2.99
@@ -727,7 +727,8 @@
export CC
CXX=clang++
export CXX
- JAVA_HOME="/usr/java/jdk1.8.0_11"
+ #JAVA_HOME="/usr/java/jdk1.8.0_11"
+ JAVA_HOME="/usr/java/jdk1.7.0_03"
export JAVA_HOME
%autogen
%configure \
@@ -761,6 +762,7 @@
--with-pakchois \
--without-gnutls \
--with-neon=internal \
+ --enable-threadsafe-ssl \
--with-ssl=openssl \
--with-libproxy \
--with-expat \
@@ -806,8 +808,11 @@
--enable-build-versionscript \
--enable-build-warnings \
--enable-build-debug \
+ --enable-build-sanitize-address \
--enable-maintainer-mode
+# --enable-build-sanitize-address
+
# Momonga 7
%momonga
%autogen
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
