rpms/ghostscript
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed LDFLAGS when building dynamically linked executables (bug #565935).

Browse Source
This commit is contained in:
Tim Waugh 2010-02-19 11:32:07 +00:00
parent be331bbe54
commit e83bbf85ef
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ghostscript-ldflags.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up ghostscript-8.71/base/unix-dll.mak.ldflags ghostscript-8.71/base/unix-dll.mak
--- ghostscript-8.71/base/unix-dll.mak.ldflags 2009-10-19 21:24:53.000000000 +0100
+++ ghostscript-8.71/base/unix-dll.mak 2010-02-19 10:07:06.645044318 +0000
@@ -88,8 +88,9 @@ $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOAD
# ------------------------- Recursive make targets ------------------------- #
-SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\
+SODEFS=\
GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
+ GS_XE_LDFLAGS=$(LDFLAGS_SO)\
STDIO_IMPLEMENTATION=c\
DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
BINDIR=$(BINDIR)/$(SOBINRELDIR)\
diff -up ghostscript-8.71/base/unixlink.mak.ldflags ghostscript-8.71/base/unixlink.mak
--- ghostscript-8.71/base/unixlink.mak.ldflags 2008-02-29 08:13:08.000000000 +0000
+++ ghostscript-8.71/base/unixlink.mak 2010-02-19 10:07:06.646044276 +0000
@@ -50,7 +50,7 @@ $(GS_A): $(obj_tr) $(ECHOGS_XE) $(INT_AR
# which has limited environment space.
ldt_tr=$(PSOBJ)ldt.tr
$(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
- $(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
+ $(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(GS_XE_LDFLAGS) $(LDFLAGS) -o $(GS_XE)
$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)gs.$(OBJ) -s
cat $(ld_tr) >>$(ldt_tr)
$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)

9
ghostscript.spec
View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer.
Name: ghostscript Name: ghostscript
Version: %{gs_ver} Version: %{gs_ver}
Release: 2%{?dist} Release: 3%{?dist}
# Included CMap data is Redistributable, no modification permitted, # Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510 # see http://bugzilla.redhat.com/487510
@ -29,6 +29,7 @@ Patch10: ghostscript-cups-filters.patch
Patch11: ghostscript-CVE-2009-4270.patch Patch11: ghostscript-CVE-2009-4270.patch
Patch12: ghostscript-vsnprintf.patch Patch12: ghostscript-vsnprintf.patch
Patch13: ghostscript-pdftoraster-exit.patch Patch13: ghostscript-pdftoraster-exit.patch
Patch14: ghostscript-ldflags.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: xz BuildRequires: xz
@ -140,6 +141,9 @@ rm -rf libpng zlib jpeg jasper
# Fixed pdftoraster so that it waits for its sub-process to exit. # Fixed pdftoraster so that it waits for its sub-process to exit.
%patch13 -p1 -b .pdftoraster-exit %patch13 -p1 -b .pdftoraster-exit
# Fixed LDFLAGS when building dynamically linked executables (bug #565935).
%patch14 -p1 -b .ldflags
# Convert manual pages to UTF-8 # Convert manual pages to UTF-8
from8859_1() { from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@ -321,6 +325,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Fri Feb 19 2010 Tim Waugh <twaugh@redhat.com> 8.71-3
- Fixed LDFLAGS when building dynamically linked executables (bug #565935).
* Wed Feb 17 2010 Tim Waugh <twaugh@redhat.com> 8.71-2 * Wed Feb 17 2010 Tim Waugh <twaugh@redhat.com> 8.71-2
- Use system libtiff. - Use system libtiff.