rpms/erlang/devel erlang.spec,1.38,1.39 otp-rpath.patch,1.3,1.4
Gérard Milmeister
gemi at fedoraproject.org
Tue Apr 21 16:41:33 UTC 2009
- Previous message (by thread): rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec,1.3,1.4
- Next message (by thread): rpms/ocsinventory/F-10 ocsinventory.spec, 1.6, 1.7 sources, 1.3, 1.4 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch, 1.1, NONE ocsinventory-r1447.patch, 1.1, NONE ocsinventory-r1462.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gemi
Update of /cvs/pkgs/rpms/erlang/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25912
Modified Files:
erlang.spec otp-rpath.patch
Log Message:
Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/erlang.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- erlang.spec 1 Mar 2009 15:22:27 -0000 1.38
+++ erlang.spec 21 Apr 2009 16:41:30 -0000 1.39
@@ -3,7 +3,7 @@
Name: erlang
Version: %{ver}
-Release: %{rel}.6%{?dist}
+Release: %{rel}.7%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -65,9 +65,9 @@
%build
%ifarch sparcv9 sparc64
-CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
%else
-CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
%endif
chmod -R u+w .
make
@@ -123,6 +123,10 @@
%changelog
+* Tue Apr 21 2009 Debarshi Ray <rishi at fedoraproject.org> R12B-5.7
+- Updated rpath patch.
+- Fixed configure to respect $RPM_OPT_FLAGS.
+
* Sun Mar 1 2009 Gerard Milmeister <gemi at bluewin.ch> - R12B-5.6
- new release R12B-5
- link escript and dialyzer to %{_bindir}
otp-rpath.patch:
Index: otp-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/devel/otp-rpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- otp-rpath.patch 25 Oct 2008 21:49:08 -0000 1.3
+++ otp-rpath.patch 21 Apr 2009 16:41:31 -0000 1.4
@@ -1,6 +1,6 @@
-diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in
---- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200
-+++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200
+diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in
+--- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530
++++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530
@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),)
HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
endif
@@ -10,9 +10,9 @@
ifeq ($(strip $(LD_R_FLAG)),)
LD_R_OPT =
else
-diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile
---- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200
-+++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200
+diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile
+--- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530
++++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o
# ----------------------------------------------------
@@ -22,10 +22,19 @@
-o $@ $^ -lcrypto
$(DLL_DRIVER): $(OBJS)
-diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200
-+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200
-@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
+diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530
++++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530
+@@ -104,7 +104,7 @@ else
+ SSL_MAKEFILE =
+ endif
+
+-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
++CC_R_FLAG=
+ ifeq ($(findstring @,$(CC_R_FLAG)),@)
+ # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
+ # we try our best here instead...
+@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
CC_R_FLAG =
else
ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath,
- Previous message (by thread): rpms/leonidas-kde-theme/F-11 leonidas-kde-theme.spec,1.3,1.4
- Next message (by thread): rpms/ocsinventory/F-10 ocsinventory.spec, 1.6, 1.7 sources, 1.3, 1.4 ocsinventory-r1413.patch, 1.1, NONE ocsinventory-r1423.patch, 1.1, NONE ocsinventory-r1447.patch, 1.1, NONE ocsinventory-r1462.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list