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: 11-May-2016 21:20:36
Branch: rpm-5_4 Handle: 2016051119203600
Modified files: (Branch: rpm-5_4)
rpm devtool.conf
Log:
- jvm: resurrect on El Capitan.
Summary:
Revision Changes Path
2.365.2.106 +11 -8 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.105 -r2.365.2.106 devtool.conf
--- rpm/devtool.conf 8 May 2016 18:49:01 -0000 2.365.2.105
+++ rpm/devtool.conf 11 May 2016 19:20:36 -0000 2.365.2.106
@@ -312,14 +312,15 @@
# CXX=/opt/local/bin/g++-mp-6
# export CXX
# -- clang (also needs --disable-openmp)
-# CC=clang
-# export CC
-# CXX=clang++
-# export CXX
-# CPPFLAGS="-Wno-unused-command-line-argument -Wno-array-bounds
-Wno-parentheses-equality -Wno-string-compare"
-# export CPPFLAGS
+ CC=clang-mp-3.9
+ export CC
+ CXX=clang++-mp-3.9
+ export CXX
+ CPPFLAGS="-Wno-unused-command-line-argument -Wno-array-bounds
-Wno-parentheses-equality -Wno-string-compare"
+ export CPPFLAGS
# -- java
-# JAVA_HOME="/usr/java/jdk1.8.0_77"
+ JAVA_HOME="`/usr/libexec/java_home`"
+ export JAVA_HOME
%falmouth
%autogen
%configure \
@@ -341,7 +342,7 @@
--with-readline \
--without-augeas \
--with-beecrypt=internal \
- --without-java \
+ --with-java \
--with-openssl \
--with-nss \
--with-gcrypt \
@@ -377,6 +378,8 @@
--with-perlembed=/opt/local/lib/perl5/5.22/darwin-thread-multi-2level/CORE \
--without-perl-urpm \
--with-ruby=/opt/local/lib/ruby/1.8 \
+ --without-mruby \
+ --with-jvm=$JAVA_HOME \
--without-selinux \
--without-sepol \
--without-semanage \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
