diff options
| author | Gérard Milmeister <gemi@fedoraproject.org> | 2009-04-21 17:55:03 +0000 |
|---|---|---|
| committer | Gérard Milmeister <gemi@fedoraproject.org> | 2009-04-21 17:55:03 +0000 |
| commit | 9d47c2f5d432879cb90e9ea0554afd6da4c419ce (patch) | |
| tree | 9b5e4eeb4f2df8e526091e13eecf0c29e492a919 | |
| parent | 4bf0f6f6778fb65cf367b4fb3739d6ec21f54075 (diff) | |
| download | erlang-9d47c2f5d432879cb90e9ea0554afd6da4c419ce.tar.gz erlang-9d47c2f5d432879cb90e9ea0554afd6da4c419ce.tar.xz erlang-9d47c2f5d432879cb90e9ea0554afd6da4c419ce.zip | |
*** empty log message ***
| -rw-r--r-- | erlang.spec | 10 | ||||
| -rw-r--r-- | otp-rpath.patch | 29 |
2 files changed, 26 insertions, 13 deletions
diff --git a/erlang.spec b/erlang.spec index 4e5471f..4e37e51 100644 --- a/erlang.spec +++ b/erlang.spec @@ -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 @@ sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 21 2009 Debarshi Ray <rishi@fedoraproject.org> R12B-5.7 +- Updated rpath patch. +- Fixed configure to respect $RPM_OPT_FLAGS. + * Sun Mar 1 2009 Gerard Milmeister <gemi@bluewin.ch> - R12B-5.6 - new release R12B-5 - link escript and dialyzer to %{_bindir} diff --git a/otp-rpath.patch b/otp-rpath.patch index 95d38d2..5b1d459 100644 --- a/otp-rpath.patch +++ b/otp-rpath.patch @@ -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 @@ diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/cr 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 @@ diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto -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, |