diff options
author | hira <hira@pkgsrc.org> | 2008-10-18 01:28:22 +0000 |
---|---|---|
committer | hira <hira@pkgsrc.org> | 2008-10-18 01:28:22 +0000 |
commit | 0858bebe7e0954c4e4579e17eb5a9624e8fc52b8 (patch) | |
tree | cfda5abf903b5f12a49a542348b568572c25fc77 /misc/openoffice2 | |
parent | b55c8285bd5daeb9f99faec544abc550288881ba (diff) | |
download | pkgsrc-0858bebe7e0954c4e4579e17eb5a9624e8fc52b8.tar.gz |
- Add missing -Wl to patch-ch and patch-cs.
- Correct flag for disabling optimizations.
Ride on previous PKGREVISION bump.
Diffstat (limited to 'misc/openoffice2')
-rw-r--r-- | misc/openoffice2/distinfo | 6 | ||||
-rw-r--r-- | misc/openoffice2/patches/patch-ch | 8 | ||||
-rw-r--r-- | misc/openoffice2/patches/patch-cs | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo index 2d862a56515..8b05140ed5c 100644 --- a/misc/openoffice2/distinfo +++ b/misc/openoffice2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2008/10/18 01:09:44 hira Exp $ +$NetBSD: distinfo,v 1.46 2008/10/18 01:28:22 hira Exp $ SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9 RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417 @@ -49,14 +49,14 @@ SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6 -SHA1 (patch-ch) = 5785607cff893f32b16bb5bcd30dc6c3942633e0 +SHA1 (patch-ch) = be68bf0e05b2d80102fb098f703bf80bb4fa6abc SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd -SHA1 (patch-cs) = ac54843e3aca0c798753bbb7670bb12bcb92272e +SHA1 (patch-cs) = 55f2296e74c80f32ea548d38c4bbd9114e403fd3 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e diff --git a/misc/openoffice2/patches/patch-ch b/misc/openoffice2/patches/patch-ch index 4aac2150ae1..92eb57070da 100644 --- a/misc/openoffice2/patches/patch-ch +++ b/misc/openoffice2/patches/patch-ch @@ -1,4 +1,4 @@ -$NetBSD: patch-ch,v 1.3 2007/10/06 20:02:23 hira Exp $ +$NetBSD: patch-ch,v 1.4 2008/10/18 01:28:22 hira Exp $ --- solenv/inc/unxbsdi3.mk.orig 2007-10-05 10:11:25.000000000 +0900 +++ solenv/inc/unxbsdi3.mk 2007-10-05 10:14:03.000000000 +0900 @@ -91,7 +91,7 @@ $NetBSD: patch-ch,v 1.3 2007/10/06 20:02:23 hira Exp $ +# reduce to -O1 to avoid optimization problems +CFLAGSOPT=-O1 +# Compiler flags for disabling optimizations -+CFLAGSNOOPT=-O ++CFLAGSNOOPT=-O0 +# Compiler flags for describing the output path +CFLAGSOUTOBJ=-o + @@ -111,9 +111,9 @@ $NetBSD: patch-ch,v 1.3 2007/10/06 20:02:23 hira Exp $ +LINKC*=$(CC) + +# default linker flags -+LINKFLAGSDEFS*=-z defs ++LINKFLAGSDEFS*=-Wl,-z,defs +LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) ++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + +# linker flags for linking applications +LINKFLAGSAPPGUI= -Wl,-export-dynamic diff --git a/misc/openoffice2/patches/patch-cs b/misc/openoffice2/patches/patch-cs index fe194e43652..5f31273d16f 100644 --- a/misc/openoffice2/patches/patch-cs +++ b/misc/openoffice2/patches/patch-cs @@ -1,4 +1,4 @@ -$NetBSD: patch-cs,v 1.2 2008/10/18 01:09:44 hira Exp $ +$NetBSD: patch-cs,v 1.3 2008/10/18 01:28:22 hira Exp $ --- solenv/inc/unxbsdx3.mk.orig 2007-10-13 00:24:19.000000000 +0900 +++ solenv/inc/unxbsdx3.mk 2007-10-13 00:28:56.000000000 +0900 @@ -91,7 +91,7 @@ $NetBSD: patch-cs,v 1.2 2008/10/18 01:09:44 hira Exp $ +# reduce to -O1 to avoid optimization problems +CFLAGSOPT=-O1 +# Compiler flags for disabling optimizations -+CFLAGSNOOPT=-O ++CFLAGSNOOPT=-O0 +# Compiler flags for describing the output path +CFLAGSOUTOBJ=-o + @@ -111,9 +111,9 @@ $NetBSD: patch-cs,v 1.2 2008/10/18 01:09:44 hira Exp $ +LINKC*=$(CC) + +# default linker flags -+LINKFLAGSDEFS*=-z defs ++LINKFLAGSDEFS*=-Wl,-z,defs +LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) ++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + +# linker flags for linking applications +LINKFLAGSAPPGUI= -Wl,-export-dynamic |