diff --git a/js-ldflags.patch b/js-ldflags.patch new file mode 100644 index 0000000..99ffa0c --- /dev/null +++ b/js-ldflags.patch @@ -0,0 +1,11 @@ +--- src/Makefile.ref.orig 2005-04-19 22:14:17.000000000 +0300 ++++ src/Makefile.ref 2005-04-19 22:14:49.000000000 +0300 +@@ -108,7 +108,7 @@ + PERLLDFLAGS := $(subst -rdynamic,-export-dynamic,$(PERLLDFLAGS)) + + CFLAGS += $(PERLCFLAGS) +-#LDFLAGS += $(PERLLDFLAGS) #PH removed this assgnment ++LDFLAGS += $(PERLLDFLAGS) + INCLUDES += -I. #needed for perlconnect/jsperl.c + endif + diff --git a/js-shlib.patch b/js-shlib.patch index 22a4cb1..9a24d20 100644 --- a/js-shlib.patch +++ b/js-shlib.patch @@ -1,3 +1,5 @@ +Use gcc for linking because of -Wl,... from "perl -MExtUtils::Embed -e ldopts". + --- src/config/Linux_All.mk.orig 2003-05-16 02:21:08.000000000 +0200 +++ src/config/Linux_All.mk 2004-03-02 03:56:15.000000000 +0100 @@ -42,7 +42,7 @@ @@ -5,7 +7,7 @@ RANLIB = echo -MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -+MKSHLIB = $(LD) -shared -lc -soname libjs.so.1 $(XMKSHLIBOPTS) ++MKSHLIB = $(CC) -shared -lc -Wl,-soname,libjs.so.1 $(XMKSHLIBOPTS) #.c.o: # $(CC) -c -MD $*.d $(CFLAGS) $< diff --git a/js.spec b/js.spec index fa278b6..2c8cf2b 100644 --- a/js.spec +++ b/js.spec @@ -5,8 +5,7 @@ Summary: JavaScript interpreter and libraries Name: js Version: 1.5 -Release: 0.rc6a.5 - +Release: 0.rc6a.6 %if 0%{?_without_readline:1} License: MPL/GPL/LGPL %else @@ -19,6 +18,7 @@ Patch0: js-make.patch Patch1: js-shlib.patch Patch2: js-perlconnect.patch Patch3: js-va_copy.patch +Patch4: js-ldflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl >= 1:5.6.1 readline-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -46,6 +46,7 @@ you will need to install %{name}-devel. %patch1 -b .shlib %patch2 -b .perl %patch3 -p 1 -b .vacopy +%patch4 -b .ldflags cp src/perlconnect/README.html src/README.perlconnect.html %build @@ -106,6 +107,9 @@ LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test %{_includedir}/js*.h %changelog +* Tue Apr 19 2005 Ville Skyttä - 1.5-0.rc6a.6 +- Link shared lib with libperl. + * Fri Apr 7 2005 Michael Schwendt - rebuilt