rpms/js/devel js-ldflags.patch, NONE, 1.1 js-shlib.patch, 1.1, 1.2 js.spec, 1.5, 1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2772/devel

Modified Files:
	js-shlib.patch js.spec 
Added Files:
	js-ldflags.patch 
Log Message:
Link shared lib with libperl.

js-ldflags.patch:

--- NEW FILE js-ldflags.patch ---
--- 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
 

js-shlib.patch:

Index: js-shlib.patch
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js-shlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- js-shlib.patch	9 Nov 2004 02:47:15 -0000	1.1
+++ js-shlib.patch	19 Apr 2005 20:19:07 -0000	1.2
@@ -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) $<


Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- js.spec	6 Apr 2005 22:12:02 -0000	1.5
+++ js.spec	19 Apr 2005 20:19:07 -0000	1.6
@@ -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 @@
 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 @@
 %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 @@
 %{_includedir}/js*.h
 
 %changelog
+* Tue Apr 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.5-0.rc6a.6
+- Link shared lib with libperl.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt