Re: pkg/46983: openoffice3 fails to start properly

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

The following reply was made to PR pkg/46983; it has been noted by GNATS.

From: Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: tsutsui%ceres.dti.ne.jp@localhost
Subject: Re: pkg/46983: openoffice3 fails to start properly
Date: Tue, 12 Mar 2013 00:39:55 +0900

 The attached patch to www/curl and misc/openoffice3 makes
 openoffice3 binary work on pkgsrc HEAD and NetBSD/i386 6.0.1.
 
 - openoffice3 binary in pkgsrc-2012Q1 works, and pkgsrc-2012Q2 doesn't
 - per investigation by Yasushi Oshima,
   openoffice3 binary using pkgsrc-HEAD 20120415 works, and 20120418 doesn't
 
 - only www/curl was updated from 7.24.0 to 7.25.0 in that period
   http://mail-index.netbsd.org/pkgsrc-changes/2012/04/17/msg071234.html
 - curl-config command was changed in 7.25.0 that no longer prints
   "-Wl,-R/usr/pkg/lib" on "curl-config --libs"
 
 - openoffice3 build failed due to lack of the above curl linkflags
   and patch-ch and patch-cs were changed to explicitly pass
   -Wl,-rpath,/usr/pkg/lib instead of the original "$ORIGIN"
   http://mail-index.netbsd.org/pkgsrc-changes/2012/06/29/msg074788.html
 - probably that $ORIGIN value is mandatory for all possible necessary
   libraries on openoffice3 build (but not sure how this could cause segv)
 
 The patch just changes:
 - make "curl-config --libs" also return @LDFLAGS@ that will contain
   "-Wl,-R/usr/pkg/lib" (not sure why only --static-libs has it)
 - revert patch-ch rev 1.3 and patch-cs rev 1.4 to pass $ORIGIN for -rpath
 
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/misc/openoffice3/patches/patch-ch.diff?r1=1.2&r2=1.3
 
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/misc/openoffice3/patches/patch-cs.diff?r1=1.3&r2=1.4
 
 openoffice3-3.1.1nb40 in HEAD works fine on NetBSD/i386 6.0.1
 with this patch.
 
 Index: misc/openoffice3/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/misc/openoffice3/distinfo,v
 retrieving revision 1.33
 diff -u -r1.33 distinfo
 --- misc/openoffice3/distinfo  29 Jun 2012 12:36:39 -0000      1.33
 +++ misc/openoffice3/distinfo  10 Mar 2013 16:36:25 -0000
 @@ -56,7 +56,7 @@
  SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
  SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
  SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
 -SHA1 (patch-ch) = 1e456a34ebcf8639aa1a976e8c5fd05d1ef3ef5c
 +SHA1 (patch-ch) = 754a8df8c7002cfee53edf288cfc13fbc8d7db15
  SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
  SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
  SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f
 @@ -64,7 +64,7 @@
  SHA1 (patch-configmgr_source_treemgr_templateimpl.hxx) = 
d34ed7ddfcd879072993f84e44b32e52c961dffe
  SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
  SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 -SHA1 (patch-cs) = 49b457e23f9edca560abee0acfbbe5ea64b5ea1a
 +SHA1 (patch-cs) = 0e5736bf2544dd8d3c5e2b54d4c8c47227b7ef01
  SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
  SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
  SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 Index: misc/openoffice3/patches/patch-ch
 ===================================================================
 RCS file: /cvsroot/pkgsrc/misc/openoffice3/patches/patch-ch,v
 retrieving revision 1.3
 diff -u -r1.3 patch-ch
 --- misc/openoffice3/patches/patch-ch  29 Jun 2012 12:36:39 -0000      1.3
 +++ misc/openoffice3/patches/patch-ch  10 Mar 2013 16:36:25 -0000
 @@ -112,7 +112,7 @@
  +
  +# default linker flags
  +LINKFLAGSDEFS*=-Wl,-z,defs
 -+LINKFLAGSRUNPATH*=-Wl,-rpath,${PREFIX}/lib
 ++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
  +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
  +
  +# linker flags for linking applications
 Index: misc/openoffice3/patches/patch-cs
 ===================================================================
 RCS file: /cvsroot/pkgsrc/misc/openoffice3/patches/patch-cs,v
 retrieving revision 1.4
 diff -u -r1.4 patch-cs
 --- misc/openoffice3/patches/patch-cs  29 Jun 2012 12:36:39 -0000      1.4
 +++ misc/openoffice3/patches/patch-cs  10 Mar 2013 16:36:25 -0000
 @@ -112,7 +112,7 @@
  +
  +# default linker flags
  +LINKFLAGSDEFS*=-Wl,-z,defs
 -+LINKFLAGSRUNPATH*=-Wl,-rpath,${PREFIX}/lib
 ++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
  +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
  +
  +# linker flags for linking applications
 Index: www/curl/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/curl/distinfo,v
 retrieving revision 1.83
 diff -u -r1.83 distinfo
 --- www/curl/distinfo  10 Mar 2013 13:21:05 -0000      1.83
 +++ www/curl/distinfo  10 Mar 2013 16:36:25 -0000
 @@ -4,4 +4,5 @@
  RMD160 (curl-7.29.0.tar.bz2) = 50c2ee716736dc0f1de26e032f525e7511912b95
  Size (curl-7.29.0.tar.bz2) = 2556495 bytes
  SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570
 +SHA1 (patch-curl-config.in) = 1cdfcc7e419d8e1c5abba607f16f3e1f8dc74355
  SHA1 (patch-lib_multi.c) = ead077ecdb819081e7a271feb6e249a20e025f75
 --- /dev/null
 +++ www/curl/patches/patch-curl-config.in
 @@ -0,0 +1,16 @@
 +$NetBSD$
 +
 +--- curl-config.in.orig       2012-08-08 21:38:25.000000000 +0000
 ++++ curl-config.in
 +@@ -148,9 +148,9 @@
 +         CURLLIBDIR=""
 +      fi
 +      if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
 +-       echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
 ++       echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@
 +      else
 +-       echo ${CURLLIBDIR}-lcurl
 ++       echo ${CURLLIBDIR}-lcurl @LDFLAGS@
 +      fi
 +      ;;
 + 
 
 ---
 Izumi Tsutsui