[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac Makefile.in Repository.mk solenv/gbuild svx/Module_svx.mk
Makefile.in |5 + Repository.mk |4 +--- configure.ac|2 +- solenv/gbuild/platform/MACOSX_X86_64_GCC.mk |2 +- svx/Module_svx.mk |2 -- 5 files changed, 8 insertions(+), 7 deletions(-) New commits: commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5 Author: Tor Lillqvist t...@collabora.com Date: Tue Sep 23 00:27:58 2014 +0300 We need the gengal program at build time But don't bother shipping it on OS X, at least not in the sandboxed (App Store) case. Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24 diff --git a/Makefile.in b/Makefile.in index af2096a..de9fa46 100644 --- a/Makefile.in +++ b/Makefile.in @@ -311,6 +311,11 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) # And with it removed, presumably the other stuff in the Python lib/python3.3/config-3.3m probably does not make sense either. rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]* # +ifneq ($ENABLE_MACOSX_SANDBOX),) +# Remove the gengal.bin binary that we don't want + rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin +endif +# # Then use the macosx-codesign-app-bundle script @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app endif diff --git a/Repository.mk b/Repository.mk index 9976a3c..96224ad 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,9 +76,7 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ )) $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ - $(if $(ENABLE_MACOSX_SANDBOX),, \ - gengal \ - )\ + gengal \ )) $(eval $(call gb_Helper_register_executables,OOO, \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 0e63435..80f2bd7 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,13 +34,11 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) -ifeq (,$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal.bin \ Package_gengal \ )) endif -endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ commit 914147f74d7e961b74e5a4c284a8c4cc9d64b3e4 Author: Tor Lillqvist t...@collabora.com Date: Mon Sep 22 20:28:45 2014 +0300 Let's use -O3 Change-Id: Id7d068df3cabe9e7c01cc90ffdc61fa325f79dab diff --git a/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk b/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk index a31437a..4dc20c9 100644 --- a/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk +++ b/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk @@ -8,7 +8,7 @@ # #* -gb_COMPILERDEFAULTOPTFLAGS := -O2 +gb_COMPILERDEFAULTOPTFLAGS := -O3 include $(GBUILDDIR)/platform/macosx.mk commit 9c611469c6f1b3dd1ad895400fe3b2fc2f34cd05 Author: Tor Lillqvist t...@collabora.com Date: Mon Sep 22 19:56:15 2014 +0300 Bump patch level for new Mac App Store submit attempt For some reason the 4.2.10013 build has got stuck in Apple's machinery or something, and doesn't show up in iTunes Connect, it is not selectable on the app's page. Let's see if submitting a new build will help. Change-Id: I1a38337af7d6b75654ce9fbe06a6d95c20a97056 diff --git a/configure.ac b/configure.ac index fce44a3..3e254d6 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.13],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.14],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac solenv/bin
configure.ac |2 +-
solenv/bin/macosx-codesign-app-bundle |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 606d682dec504048be779c8cb731944061f79086
Author: Tor Lillqvist t...@collabora.com
Date: Sun Sep 21 02:10:44 2014 +0300
Bump patch level for new Mac App Store submit attempt
Change-Id: If06ce10fe3ab583a1e488e17385683f88cebf646
diff --git a/configure.ac b/configure.ac
index d9e7cee..9ba3da3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.2.10.11],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.12],[],[],[https://libreoffice-from-collabora.com/])
AC_PREREQ([2.59])
commit e503a0abb3f9e9c02de22bb024bb64211df1ab40
Author: Tor Lillqvist t...@collabora.com
Date: Sun Sep 21 02:10:14 2014 +0300
Need the entitlements for embedded app executables too
Change-Id: I75f31df295fdf7bccf82356c26ba757cc7ea276c
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index 1996bda..028de8f 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -70,7 +70,7 @@ while read app; do
fn=${fn%.*}
# Assume the app has a XML (and not binary) Info.plist
id=`grep -A 1 'keyCFBundleIdentifier/key' $app/Contents/Info.plist |
tail -1 | sed -e 's,.*string,,' -e 's,/string.*,,'`
-codesign --verbose --identifier=$id --sign $MACOSX_CODESIGNING_IDENTITY
$app
+codesign --verbose --identifier=$id --sign $MACOSX_CODESIGNING_IDENTITY
$entitlements $app
done
# Then .framework ones. Again, be generic just for kicks.
commit 426e3fe59649ce938954e1bf707630391b30ed23
Author: Tor Lillqvist t...@collabora.com
Date: Sun Sep 21 00:59:08 2014 +0300
Bump patch level for new Mac App Store submit attempt
Change-Id: Idd30a46a5212660d56bc5d84696b2e2d2f6d0cbb
diff --git a/configure.ac b/configure.ac
index 1f3c898..d9e7cee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.2.10.10],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.11],[],[],[https://libreoffice-from-collabora.com/])
AC_PREREQ([2.59])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac lo.xcent.in
configure.ac | 15 ++- lo.xcent.in |9 + 2 files changed, 15 insertions(+), 9 deletions(-) New commits: commit ef81d67c15d8981795c4f063d61c77eef6406d94 Author: Tor Lillqvist t...@collabora.com Date: Mon Sep 22 00:10:05 2014 +0300 Bump patch level for new Mac App Store submit attempt Change-Id: I432ce5afe65c91fb3133a975508724ed00932e2f diff --git a/configure.ac b/configure.ac index 6dd799b..fce44a3 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.12],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.13],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) commit b0fd980fc6eeaf3043233f17c89bc9abfdb4d36a Author: Tor Lillqvist t...@collabora.com Date: Mon Sep 22 00:07:53 2014 +0300 The com.apple.application-identifier value should be prefixed with the teamid Change-Id: I6b58492ba051bb5032870aa47cfacbe3a292e31f diff --git a/configure.ac b/configure.ac index 9ba3da3..6dd799b 100644 --- a/configure.ac +++ b/configure.ac @@ -1231,6 +1231,12 @@ AC_ARG_ENABLE(macosx-sandbox, adherence to App Store rules.]), ,) +AC_ARG_WITH(macosx-teamid, +AS_HELP_STRING([--with-macosx-teamid=teamid], +[The team id to be used for com.apple.application-identifier + in the entitlements when building a sandboxed LibreOffice.]), +,) + AC_ARG_ENABLE(canonical-installation-tree-structure, AS_HELP_STRING([--enable-canonical-installation-tree-structure], [Make the installation tree structure be more canonical for @@ -2921,8 +2927,14 @@ if test $_os = Darwin; then AC_MSG_CHECKING([whether to sandbox the application]) +if test -n $with_macosx_teamid -a $with_macosx_teamid != yes -a $with_macosx_teamid != no; then +MACOSX_TEAMID=$with_macosx_teamid +fi + if test -z $MACOSX_CODESIGNING_IDENTITY -a $enable_macosx_sandbox = yes; then AC_MSG_ERROR([OS X sandboxing requires code signing]) +elif test -z $MACOSX_TEAMID -a $enable_macosx_sandbox = yes; then +AC_MSG_ERROR([OS X sandboxing requires a team id]) elif test -n $ENABLE_JAVA -a $enable_macosx_sandbox = yes; then AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java]) elif test -n $MACOSX_CODESIGNING_IDENTITY -a $enable_macosx_sandbox = yes; then @@ -2952,6 +2964,7 @@ AC_SUBST(MACOSX_CODESIGNING_IDENTITY) AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY) AC_SUBST(ENABLE_MACOSX_SANDBOX) AC_SUBST(MACOSX_BUNDLE_IDENTIFIER) +AC_SUBST(MACOSX_TEAMID) AC_SUBST(MACOSX_APP_NAME) dnl === diff --git a/lo.xcent.in b/lo.xcent.in index 19802dd..f804daf 100644 --- a/lo.xcent.in +++ b/lo.xcent.in @@ -3,7 +3,7 @@ plist version=1.0 dict keycom.apple.application-identifier/key - string@MACOSX_BUNDLE_IDENTIFIER@/string + string@MACOSX_TEAMID@.@MACOSX_BUNDLE_IDENTIFIER@/string keycom.apple.security.app-sandbox/key true/ keycom.apple.security.files.bookmarks.app-scope/key commit a1379c6d2555c77b1b096165ac2aab42808e90a7 Author: Tor Lillqvist t...@collabora.com Date: Sun Sep 21 23:55:38 2014 +0300 We don't build the Apple Remote code when sandboxed So no need for the related entitlements. Change-Id: I54ba7c0586ee77f30096b50755a9a85bbb7965a5 diff --git a/lo.xcent.in b/lo.xcent.in index ca636d7..19802dd 100644 --- a/lo.xcent.in +++ b/lo.xcent.in @@ -20,13 +20,6 @@ true/ keycom.apple.security.device.bluetooth/key true/ - !-- usb needed for the apple_remote thingie... -- - keycom.apple.security.device.usb/key - true/ - keycom.apple.security.temporary-exception.apple-events/key - array - stringmac.remotecontrols/string - /array keycom.apple.security.print/key true/ /dict ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac Makefile.in registry/Module_registry.mk Repository.mk solenv/bin solenv/gbuild svx/Module_svx.mk
Makefile.in | 11 ++ Repository.mk | 10 - configure.ac |2 - registry/Module_registry.mk |6 ++- solenv/bin/macosx-codesign-app-bundle | 58 +++--- solenv/gbuild/platform/macosx.mk |9 - svx/Module_svx.mk |2 + 7 files changed, 59 insertions(+), 39 deletions(-) New commits: commit 09f5eed074e6dd8474447bce5ba7ca9bd8198757 Author: Tor Lillqvist t...@collabora.com Date: Sat Sep 20 01:12:17 2014 +0300 This test was the wrong way surely? Change-Id: I3470fbd2992cd96a772452d75fb2f0320bb529bf diff --git a/configure.ac b/configure.ac index e5b4d02..b3bb9ba 100644 --- a/configure.ac +++ b/configure.ac @@ -12732,7 +12732,7 @@ if test $enable_mpl_subset = yes; then AC_MSG_ERROR([need to --disable-ext-mariadb-connector - mariadb/mysql support.]) fi if test -n $ENABLE_PDFIMPORT; then -if test x$SYSTEM_POPPLER != xNO; then +if test x$SYSTEM_POPPLER = xNO; then AC_MSG_ERROR([need to disable PDF import via poppler or use system library]) fi fi commit beb30bbd867f9a28878e0d004458c3507f6c0956 Author: Tor Lillqvist t...@collabora.com Date: Sat Sep 20 01:01:09 2014 +0300 Skip some executables in the OS X sandboxed (Mac App Store) case I doubt end-users will miss gengal.bin, regview, or regmerge. Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f diff --git a/Repository.mk b/Repository.mk index bebbef4..9976a3c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,7 +76,9 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ )) $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ - gengal \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + gengal \ + )\ )) $(eval $(call gb_Helper_register_executables,OOO, \ @@ -123,8 +125,10 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - regmerge \ - regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + regmerge \ + regview \ + ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index fb962c6..5f70ed9 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ $(if $(filter-out $(OS),IOS), \ - Executable_regmerge \ - Executable_regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + Executable_regmerge \ + Executable_regview \ + ) \ StaticLibrary_registry_helper \ ) \ )) diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 80f2bd7..0e63435 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,11 +34,13 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq (,$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal.bin \ Package_gengal \ )) endif +endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ commit 69c2fc6cfb12b939a076856bb82a18812afdfccc Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 22:58:16 2014 +0300 OS X code signing fixes Remove unnecessary Python executables and stuff that complicates code signing in the test-install target. Sign executables in codesign-macosx-app-bundle, not when building them. It is more uniform to do all code signing in just one place. All executables must have the com.apple.security.app-sandbox entitlement. Change-Id: Ic6a640eb03964fe9ce75d3a8fff071971a3e1939 diff --git a/Makefile.in b/Makefile.in index 8fc6f3d..af2096a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -291,6 +291,7 @@ ifeq ($(OS_FOR_BUILD),WNT) else @ooinstall $(TESTINSTALLDIR) ifneq ($(MACOSX_CODESIGNING_IDENTITY),) +# # Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories. set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \ bn=`basename $$F .zip`; \ @@ -299,8 +300,18 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) mkdir $$lproj; \ (cd $$lproj; unzip $$F); \ done +# # And remove the bin folder which should not be there rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin +# +# Remove unnecessary executables in the LibreOfficePython framework + rm -rf
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac
configure.ac | 23 --- 1 file changed, 4 insertions(+), 19 deletions(-) New commits: commit d65532e92e209d486cffe260adc849ae96683e6a Author: Tor Lillqvist t...@collabora.com Date: Fri Jun 6 17:39:04 2014 +0300 PackageMaker does not exist any more Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401 diff --git a/configure.ac b/configure.ac index 899dc91..e1b1ea6 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,7 +1419,7 @@ AC_ARG_WITH(package-format, [Specify package format(s) for LibreOffice installation sets. The implicit --without-package-format leads to no installation sets being generated. Possible values: aix, archive, bsd, deb, dmg, - installed, msi, native, osx, pkg, portable, and rpm. + installed, msi, native, pkg, portable, and rpm. Example: --with-package-format='deb rpm']), ,) @@ -4402,14 +4402,13 @@ AC_MSG_CHECKING([which package format to use]) if test -n $with_package_format -a $with_package_format != no; then for i in $with_package_format; do case $i in -aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg | installed | msi) +aix | bsd | deb | pkg | rpm | native | portable | archive | dmg | installed | msi) ;; *) AC_MSG_ERROR([unsupported format $i. Supported by EPM are: aix - AIX software distribution bsd - FreeBSD, NetBSD, or OpenBSD software distribution deb - Debian software distribution -osx - MacOS X software distribution pkg - Solaris software distribution rpm - RedHat software distribution native - Native software distribution for the platform @@ -7376,18 +7375,6 @@ if test $enable_epm = yes; then AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.]) fi fi -if echo $PKGFORMAT | $EGREP osx 21 /dev/null; then -if test $_os = Darwin; then -AC_MSG_CHECKING([for PackageMaker availability]) -if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then -AC_MSG_ERROR([not installed. Please install Apples Dev Tools]) -else -AC_MSG_RESULT([ok]) -fi -else -AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...]) -fi -fi if echo $PKGFORMAT | $EGREP rpm 21 /dev/null || \ echo $PKGFORMAT | $EGREP pkg 21 /dev/null; then if test $with_epm = no -a $_os != Darwin; then @@ -7426,7 +7413,7 @@ if test $enable_epm = yes; then else for i in $PKGFORMAT; do case $i in -aix | bsd | deb | osx | pkg | rpm | native | portable) +aix | bsd | deb | pkg | rpm | native | portable) AC_MSG_ERROR( [--with-package-format='$PKGFORMAT' requires --enable-epm]) ;; commit 7bafca39603f7af4c364b7ec780b7b513ae9caf9 Author: Tor Lillqvist t...@collabora.com Date: Thu Feb 20 11:18:56 2014 +0200 Don't bother mentioning the Tru64 'setld' package format Change-Id: I2a9707c70637fe5bae5d16fd45e9603318d5d82f diff --git a/configure.ac b/configure.ac index d5f2ff0..899dc91 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,7 +1419,7 @@ AC_ARG_WITH(package-format, [Specify package format(s) for LibreOffice installation sets. The implicit --without-package-format leads to no installation sets being generated. Possible values: aix, archive, bsd, deb, dmg, - installed, msi, native, osx, pkg, portable, rpm, and setld. + installed, msi, native, osx, pkg, portable, and rpm. Example: --with-package-format='deb rpm']), ,) @@ -4402,7 +4402,7 @@ AC_MSG_CHECKING([which package format to use]) if test -n $with_package_format -a $with_package_format != no; then for i in $with_package_format; do case $i in -aix | bsd | deb | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi) +aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg | installed | msi) ;; *) AC_MSG_ERROR([unsupported format $i. Supported by EPM are: @@ -4412,7 +4412,6 @@ deb - Debian software distribution osx - MacOS X software distribution pkg - Solaris software distribution rpm - RedHat software distribution -setld - Tru64 (setld) software distribution native - Native software distribution for the platform portable - Portable software distribution @@ -7427,7 +7426,7 @@ if test $enable_epm = yes; then else for i in $PKGFORMAT; do case $i in -aix | bsd | deb | osx | pkg | rpm | setld | native | portable) +aix | bsd | deb | osx | pkg | rpm | native | portable) AC_MSG_ERROR( [--with-package-format='$PKGFORMAT' requires --enable-epm]) ;; commit 371355406ad14145dbea3b0670db3706e9977b02 Author: Tor Lillqvist
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac external/coinmp RepositoryExternal.mk
RepositoryExternal.mk |2 +-
configure.ac |8 ++--
external/coinmp/ExternalPackage_coinmp.mk |2 +-
external/coinmp/ExternalProject_coinmp.mk |1 +
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 6d81c8ee3eca3e49cb17f4fa3b6f5732f0facae8
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Apr 7 09:28:06 2014 +0200
Find apr and serf libraries in --enable-dbgutil Windows build.
Change-Id: I06af5605ac5cf8606864b7c42527aa567571341a
(cherry picked from commit 702d79a3f8fd3c5e4b433195908317075c87ad9d)
diff --git a/configure.ac b/configure.ac
index 69036cd..54fd9f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9283,14 +9283,18 @@ serf)
[-I${WORKDIR}/UnpackedTarball/apr/include
-I${WORKDIR}/UnpackedTarball/apr_util/include],
[-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1])
if test $COM = MSC; then
-APR_LIBS=${WORKDIR}/UnpackedTarball/apr/LibR/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/LibR/aprutil-1.lib
+APR_LIB_DIR=LibR
+test -n MSVC_USE_DEBUG_RUNTIME APR_LIB_DIR=LibD
+APR_LIBS=${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib
fi
# Check for system serf
libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 =
1.1.0],[-I${WORKDIR}/UnpackedTarball/serf],
[-L${WORKDIR}/UnpackedTarball/serf/.libs
-lserf-1])
if test $COM = MSC; then
-SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/Release/serf-1.lib
+SERF_LIB_DIR=Release
+test -n MSVC_USE_DEBUG_RUNTIME SERF_LIB_DIR=Debug
+SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib
fi
;;
neon)
commit bdf04730079523303a7c10c7af97ee5f67ad0a92
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date: Sat Apr 5 12:02:38 2014 +0900
Fix Windows build(external/coinmp)
This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.
Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
(cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a)
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 23bee81..c932194 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1891,7 +1891,7 @@ define gb_LinkTarget__use_coinmp
$(call gb_LinkTarget_use_package,$(1),coinmp)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+ $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk
b/external/coinmp/ExternalPackage_coinmp.mk
index de01822..bbea3dd 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,7 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
$(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
ifeq ($(OS),WNT)
-$(eval $(call
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll))
+$(eval $(call
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
else ifeq ($(OS),MACOSX)
$(eval $(call
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib))
$(eval $(call
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib))
commit c06d624c81bafba1b61052aa5078d10f023e276b
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 4 18:12:16 2014 +0200
coinmp: actually link the libraries
Several people named Chris report failures in the solver unit test, and
apparently the CoinMP libraries have loads of unresolved symbols
because they don't have NEEDED entries, i.e. were not linked properly;
let's see if this fixes it.
Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0
Reviewed-on: https://gerrit.libreoffice.org/8850
Reviewed-by: Chris Laplante mostthings...@gmail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 6731f6c36faf64ab4522f0ffe2045c794849fabe)
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index b66e877..c18f2d5 100644
---
