Makefile.in | 2
Repository.mk | 4 -
RepositoryModule_build.mk | 2
configure.ac | 70 ++++++++++------------
connectivity/Library_postgresql-sdbc-impl.mk | 4 -
connectivity/Module_connectivity.mk | 4 -
external/Module_external.mk | 2
external/curl/ExternalProject_curl.mk | 4 -
external/hsqldb/UnpackedTarball_hsqldb.mk | 2
external/icu/ExternalProject_icu.mk | 4 -
external/libxml2/ExternalProject_xml2.mk | 4 -
external/libxmlsec/ExternalProject_xmlsec.mk | 4 -
external/libxslt/ExternalProject_xslt.mk | 4 -
external/lpsolve/ExternalProject_lpsolve.mk | 4 -
external/mingw-externals/Package_mingw_gccdlls.mk | 4 -
external/moz/Module_moz.mk | 2
external/msc-externals/Module_msc-externals.mk | 2
external/nss/ExternalProject_nss.mk | 6 -
external/openssl/opensslmingw.patch | 4 -
external/postgresql/ExternalProject_postgresql.mk | 4 -
external/python3/ExternalProject_python3.mk | 2
external/redland/ExternalProject_raptor.mk | 2
external/redland/ExternalProject_rasqal.mk | 2
external/redland/ExternalProject_redland.mk | 2
extras/Module_extras.mk | 2
mysqlc/Extension_mysql-connector-ooo.mk | 2
mysqlc/Library_mysqlc.mk | 3
odk/Module_odk.mk | 2
odk/Package_unowinreg.mk | 4 -
postprocess/CustomTarget_registry.mk | 4 -
postprocess/Rdb_services.mk | 2
solenv/gbuild/Tempfile.mk | 2
solenv/gbuild/UnpackedTarball.mk | 2
33 files changed, 81 insertions(+), 86 deletions(-)
New commits:
commit 16986df5610e062e0b5e09ea10441b2647d4ae6b
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Mar 11 11:09:57 2014 +0100
normalize values of WITH_MOZAB4WIN
Change-Id: Iad5aa66635a34a4dfceb0bd6145f2d9bd197cc17
diff --git a/Repository.mk b/Repository.mk
index 204a16b..a97f652 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -375,11 +375,11 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_ATL),,oleautobridge) \
smplmail \
wininetbe1 \
- $(if $(filter YES,$(WITH_MOZAB4WIN)), \
+ $(if $(WITH_MOZAB4WIN), \
mozab2 \
mozabdrv \
) \
- $(if $(filter NO,$(WITH_MOZAB4WIN)),mozbootstrap) \
+ $(if $(WITH_MOZAB4WIN),,mozbootstrap) \
) \
$(if $(filter $(OS),WNT),, \
mork \
diff --git a/configure.ac b/configure.ac
index c5a3d8a..6c453e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8679,7 +8679,7 @@ dnl
===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([whether to enable build of Mozilla addressbook
connectivity driver for Windows])
if test "$enable_win_mozab_driver" = "yes" -a "$WITH_MINGW" != "YES" ; then
- WITH_MOZAB4WIN=YES
+ WITH_MOZAB4WIN=TRUE
AC_MSG_RESULT([yes, internal (old windows mozab driver)])
BUILD_TYPE="$BUILD_TYPE MOZ"
MSVC80_DLLS="msvcp80.dll msvcr80.dll Microsoft.VC80.CRT.manifest"
@@ -8691,7 +8691,7 @@ if test "$_os" = "WINNT"; then
done
else
AC_MSG_RESULT([no])
- WITH_MOZAB4WIN=NO
+ WITH_MOZAB4WIN=
fi
fi
AC_SUBST(WITH_MOZAB4WIN)
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index 8d2253c..210a477 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -104,7 +104,7 @@ endif
ifeq ($(OS),WNT)
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mozab \
Library_mozab \
diff --git a/external/moz/Module_moz.mk b/external/moz/Module_moz.mk
index 9c4a245..3f4b6ef 100644
--- a/external/moz/Module_moz.mk
+++ b/external/moz/Module_moz.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,moz))
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
$(eval $(call gb_Module_add_targets,moz,\
ExternalPackage_runtime \
diff --git a/external/msc-externals/Module_msc-externals.mk
b/external/msc-externals/Module_msc-externals.mk
index 8790e4f..58a2195 100644
--- a/external/msc-externals/Module_msc-externals.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,msc-externals))
$(eval $(call gb_Module_add_targets,msc-externals,\
$(if $(ENABLE_CRASHDUMP),Package_dbghelp) \
Package_msvc_dlls \
- $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
+ $(if $(WITH_MOZAB4WIN),Package_msvc80_dlls) \
))
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 6764568..c4a4495 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -287,7 +287,7 @@ postprocess_FILES_main += \
$(call
gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
postprocess_DRIVERS += dbase flat mysql odbc
ifeq (WNT,$(OS))
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
postprocess_FILES_main += $(call
gb_XcuModuleTarget_get_target,connectivity/registry/mozab)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
postprocess_DRIVERS += mozab
endif
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index e86a89f..2e5a933 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -283,7 +283,7 @@ $(eval $(call gb_Rdb_add_components,services,\
ifeq ($(OS),WNT)
-ifeq ($(WITH_MOZAB4WIN),YES)
+ifneq ($(WITH_MOZAB4WIN),)
$(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/mozab/mozab \
))
commit e3ba76406b90af1bd7ed814e0b44fb6f182c6428
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 23:42:26 2014 +0100
normalize values of DO_FETCH_TARBALLS
This one has additional value "ALL".
Change-Id: Id804172eee899b443a6f8ae6bce8781136096dc7
diff --git a/Makefile.in b/Makefile.in
index 98a25e2..64aea5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -174,7 +174,7 @@ cmd:
#
# Fetch
#
-ifneq ($(DO_FETCH_TARBALLS),NO)
+ifneq ($(DO_FETCH_TARBALLS),)
include $(SRCDIR)/Makefile.fetch
fetch: download
fetch: get-submodules
diff --git a/configure.ac b/configure.ac
index 48cf9fa..c5a3d8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4785,11 +4785,11 @@ if test "$enable_fetch_external" != "no"; then
DO_FETCH_TARBALLS="ALL"
else
AC_MSG_RESULT(["yes, if we use them"])
- DO_FETCH_TARBALLS="YES"
+ DO_FETCH_TARBALLS="TRUE"
fi
else
AC_MSG_RESULT([no])
- DO_FETCH_TARBALLS="NO"
+ DO_FETCH_TARBALLS=
fi
AC_SUBST(DO_FETCH_TARBALLS)
commit 727e2e7190cf74db9933940285e36011de54d9a2
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 23:40:25 2014 +0100
normalize values of WITH_GALLERY_BUILD
... and remove the unimplemented "package" option.
Change-Id: I2b0cfcdc040b653fe0c4cd061ae4e0d7f745068c
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 981db44..11aae8e 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
ure \
xmlreader \
$(call gb_Helper_optional_for_host,DESKTOP, \
- $(if $(filter YES,$(WITH_GALLERY_BUILD)), \
+ $(if $(WITH_GALLERY_BUILD), \
avmedia \
basebmp \
basic \
diff --git a/configure.ac b/configure.ac
index 5ed0344..48cf9fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1371,9 +1371,8 @@ AC_ARG_WITH(linked-git,
AC_ARG_WITH(galleries,
AS_HELP_STRING([--with-galleries],
[Specify how galleries should be built. It is possible either to
- build these internally from source ("build"), or to (optionally
- download and) unpack them them from a package ("package"), or
- to disable them ("no")]),
+ build these internally from source ("build"),
+ or to disable them ("no")]),
)
AC_ARG_WITH(theme,
@@ -2401,11 +2400,8 @@ dnl
===================================================================
AC_MSG_CHECKING([how to build and package galleries])
if test -n "${with_galleries}"; then
if test "$with_galleries" = "build"; then
- WITH_GALLERY_BUILD=YES
+ WITH_GALLERY_BUILD=TRUE
AC_MSG_RESULT([build from source images internally])
- elif test "$with_galleries" = "package"; then
- WITH_GALLERY_BUILD=PACKAGE
- AC_MSG_ERROR([FIXME - implement build from pre-compiled package])
elif test "$with_galleries" = "no"; then
WITH_GALLERY_BUILD=
AC_MSG_RESULT([disable non-internal gallery build])
@@ -2414,7 +2410,7 @@ if test -n "${with_galleries}"; then
fi
else
if test $_os != iOS -a $_os != Android; then
- WITH_GALLERY_BUILD=YES
+ WITH_GALLERY_BUILD=TRUE
AC_MSG_RESULT([internal src images for desktop])
else
WITH_GALLERY_BUILD=
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 3fa5501..e9e90c4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -92,7 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
$(call gb_Helper_optional_for_host,DESKTOP, \
- $(if $(filter YES,$(WITH_GALLERY_BUILD)), \
+ $(if $(WITH_GALLERY_BUILD), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,NSS,nss) \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index c84d776..a2c25b4 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Module_add_l10n_targets,extras,\
AllLangPackage_autotextshare \
))
-ifeq ($(WITH_GALLERY_BUILD),YES)
+ifneq ($(WITH_GALLERY_BUILD),)
$(eval $(call gb_Module_add_targets,extras,\
Gallery_arrows \
Gallery_computers \
commit 593ff642838e7167e1f9ad935ece7bf79337e662
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 23:22:15 2014 +0100
normalize values of MINGW_SHARED_GCCLIB/MINGW_SHARED_GXXLIB
Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2
diff --git a/configure.ac b/configure.ac
index e184bc1..5ed0344 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5709,10 +5709,10 @@ using namespace std;
]], [[ try { throw 42; } catch (int e) { cout << "Yep, " << e << endl; } ]])],[
MINGW_GCCDLL=`$OBJDUMP -p conftest.exe | grep 'DLL Name: libgcc' |
$SED -e 's@.*DLL Name: @@'`
if test -n "$MINGW_GCCDLL"; then
- MINGW_SHARED_GCCLIB=YES
+ MINGW_SHARED_GCCLIB=TRUE
AC_MSG_RESULT([ $MINGW_GCCDLL])
else
- MINGW_SHARED_GCCLIB=NO
+ MINGW_SHARED_GCCLIB=
AC_MSG_RESULT([no])
fi
],[ AC_MSG_RESULT([no])
@@ -5733,10 +5733,10 @@ using namespace std;
mingw_gxxdll_root=${mingw_gxxdll_root%-[[0-9]]}
fi
MINGW_SHARED_LIBSTDCPP=-l$mingw_gxxdll_root
- MINGW_SHARED_GXXLIB=YES
+ MINGW_SHARED_GXXLIB=TRUE
AC_MSG_RESULT([$MINGW_GXXDLL])
else
- MINGW_SHARED_GXXLIB=NO
+ MINGW_SHARED_GXXLIB=
AC_MSG_RESULT([no])
fi
],[ AC_MSG_RESULT([no])
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 5e36ec8..b012079 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -64,8 +64,8 @@ $(call gb_ExternalProject_get_state_target,curl,build):
./configure --with-nss --without-ssl --enable-ftp --enable-ipv6
--disable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet
--disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
- CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- LIBS="-lws2_32 -lwinmm $(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+ CC="$(CC) -mthreads $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+ LIBS="-lws2_32 -lwinmm $(if
$(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
LDFLAGS="$(patsubst ;, -L,$(ILIB))" \
CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" \
&& cd lib \
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index fa6ea58..78e57ac 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -32,9 +32,9 @@ else
$(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_ExternalProject_run,build,\
CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \
- LIBS="$(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+ LIBS="$(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
LDFLAGS="-L$(COMPATH)/lib
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \
- $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
./configure \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) \
--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
diff --git a/external/libxml2/ExternalProject_xml2.mk
b/external/libxml2/ExternalProject_xml2.mk
index 3f4cb2fd..0e775f6 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -21,8 +21,8 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
--without-lzma \
--disable-static --without-debug
lt_cv_cc_dll_switch="-shared" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
- CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- LIBS="-lws2_32 $(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+ CC="$(CC) -mthreads $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+ LIBS="-lws2_32 $(if
$(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
OBJDUMP=objdump \
&& $(MAKE) \
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk
b/external/libxmlsec/ExternalProject_xmlsec.mk
index 23eb7bc..ed65c70 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -28,9 +28,9 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
&& ./configure --build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) \
--without-libxslt --without-openssl --without-gnutls
--disable-crypto-dl \
$(if $(SYSTEM_NSS),,--disable-pkgconfig) \
- CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ CC="$(CC) -mthreads $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \
- LIBS="$(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \
+ LIBS="$(if
$(MINGW_SHARED_GXXLIB),$(MINGW_SHARED__LIBSTDCPP))" \
lt_cv_deplibs_check_method=pass_all \
&& $(MAKE) \
)
diff --git a/external/libxslt/ExternalProject_xslt.mk
b/external/libxslt/ExternalProject_xslt.mk
index 979ef57..4c4967e 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -20,8 +20,8 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
$(call gb_ExternalProject_run,build,\
./configure --without-crypto --without-python --disable-static \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
- CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- $(if $(filter
YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
+ CC="$(CC) -mthreads $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+ $(if
$(MINGW_SHARED_GXXLIB),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \
OBJDUMP=objdump \
&& chmod 777 xslt-config \
diff --git a/external/lpsolve/ExternalProject_lpsolve.mk
b/external/lpsolve/ExternalProject_lpsolve.mk
index 55da704..9576298 100644
--- a/external/lpsolve/ExternalProject_lpsolve.mk
+++ b/external/lpsolve/ExternalProject_lpsolve.mk
@@ -18,8 +18,8 @@ ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,lpsolve,build):
$(call gb_ExternalProject_run,build,\
$(if $(filter WNT,$(OS_FOR_BUILD)), \
- $(if $(filter YES,$(MINGW_SHARED_GCCLIB))
lpsolve_LDFLAGS="-shared-libgcc") \
- $(if $(filter YES,$(MINGW_SHARED_GXXLIB))
lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
+ $(if $(MINGW_SHARED_GCCLIB) lpsolve_LDFLAGS="-shared-libgcc") \
+ $(if $(MINGW_SHARED_GXXLIB)
lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
cmd /c cgcc.bat, sh ccc) \
,lpsolve55)
else # $(COM)!=GCC
diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk
b/external/mingw-externals/Package_mingw_gccdlls.mk
index d3f94d1..7b30ae1 100644
--- a/external/mingw-externals/Package_mingw_gccdlls.mk
+++ b/external/mingw-externals/Package_mingw_gccdlls.mk
@@ -12,8 +12,8 @@ $(eval $(call
gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin))
$(error FIXME do not deliver this stuff to OUTDIR)
$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\
- $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
- $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \
+ $(if $(MINGW_SHARED_GCCLIB),$(MINGW_GCCDLL)) \
+ $(if $(MINGW_SHARED_GXXLIB),$(MINGW_GXXDLL)) \
))
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index 775ab55..b7e07f7 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -41,9 +41,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call
gb_ExternalProject
$(call gb_ExternalProject_run,build,\
$(MAKE) -j1 nss_build_all \
NS_USE_GCC=1 \
- CC="$(CC) $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- CXX="$(CXX) $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
- OS_LIBS="-ladvapi32 -lws2_32 -lmswsock -lwinmm $(if
$(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \
+ CC="$(CC) $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+ CXX="$(CXX) $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
+ OS_LIBS="-ladvapi32 -lws2_32 -lmswsock -lwinmm $(if
$(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \
LDFLAGS="" \
PATH="$(PATH)" \
RANLIB="$(RANLIB)" \
diff --git a/external/openssl/opensslmingw.patch
b/external/openssl/opensslmingw.patch
index e0dc960..127cb04 100644
--- a/external/openssl/opensslmingw.patch
+++ b/external/openssl/opensslmingw.patch
@@ -53,8 +53,8 @@
if errorlevel 1 goto end
+dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def
ms/ssleay32.def
+if errorlevel 1 goto end
-+if "%MINGW_SHARED_GXXLIB%"=="YES" goto shared_gxxlib
-+if "%MINGW_SHARED_GCCLIB%"=="YES" goto shared_gcclib
++if "%MINGW_SHARED_GXXLIB%"=="TRUE" goto shared_gxxlib
++if "%MINGW_SHARED_GCCLIB%"=="TRUE" goto shared_gcclib
+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def
-o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32
+if errorlevel 1 goto end
+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout
ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 0014d7f..1e6f4c8 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -84,7 +84,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
$(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \
- $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2
-Wl$(COMMA)--export-all-symbols)) \
+ $(if
$(MINGW_SHARED_GCCLIB),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2
-Wl$(COMMA)--export-all-symbols)) \
$(gb_LTOFLAGS) \
)" \
&& MAKEFLAGS= $(MAKE) \
diff --git a/external/redland/ExternalProject_raptor.mk
b/external/redland/ExternalProject_raptor.mk
index 55dff12..0c2916f 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\
ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,raptor,build):
$(call gb_ExternalProject_run,build,\
- CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ CC="$(CC) -mthreads $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols
$(subst ;, -L,$(ILIB))" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
$(if $(and $(SYSTEM_LIBXML),$(filter
GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \
diff --git a/external/redland/ExternalProject_rasqal.mk
b/external/redland/ExternalProject_rasqal.mk
index f1b8d1c..e67a302 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\
ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
- CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ CC="$(CC) -mthreads $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols
$(subst ;, -L$,$(ILIB))" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
diff --git a/external/redland/ExternalProject_redland.mk
b/external/redland/ExternalProject_redland.mk
index e643dbc..7085d3e 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\
ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,redland,build):
$(call gb_ExternalProject_run,build,\
- CC="$(CC) -mthreads $(if $(filter
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ CC="$(CC) -mthreads $(if
$(MINGW_SHARED_GCCLIB),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
commit 0afb3a7f45f423a43bbac366753cb732f4a54779
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 23:10:12 2014 +0100
normalize values of HAVE_GNUMAKE_FILE_FUNC/WITH_MYSPELL_DICTS
Change-Id: Ie8e6858194f4081e080f67a9af88108f10e1c503
diff --git a/configure.ac b/configure.ac
index 0f2106b..e184bc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4819,12 +4819,12 @@ dnl
===================================================================
AC_MSG_CHECKING([whether to include MySpell dictionaries])
if test "$with_myspell_dicts" = "yes"; then
AC_MSG_RESULT([yes])
- WITH_MYSPELL_DICTS=YES
+ WITH_MYSPELL_DICTS=TRUE
BUILD_TYPE="$BUILD_TYPE DICTIONARIES"
GIT_NEEDED_SUBMODULES="dictionaries $GIT_NEEDED_SUBMODULES"
else
AC_MSG_RESULT([no])
- WITH_MYSPELL_DICTS=NO
+ WITH_MYSPELL_DICTS=
fi
AC_SUBST(WITH_MYSPELL_DICTS)
@@ -4993,7 +4993,7 @@ all:
EOF
$GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2
if test -f $TESTGMAKEFILEFUNC/test.txt; then
- HAVE_GNUMAKE_FILE_FUNC="YES"
+ HAVE_GNUMAKE_FILE_FUNC=TRUE
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
index 3d07d6e..d10e1d2 100644
--- a/solenv/gbuild/Tempfile.mk
+++ b/solenv/gbuild/Tempfile.mk
@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-ifeq ($(HAVE_GNUMAKE_FILE_FUNC),YES)
+ifneq ($(HAVE_GNUMAKE_FILE_FUNC),)
define var2file
$(file >$(1),$(3))$(1)
endef
commit 7f61c038a0c7ad1693b4efb75d808290f1ee3931
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 23:04:47 2014 +0100
normalize values of USE_LIBRARY_BIN_TAR
Change-Id: I1101b87d3f34169f985924f8b867511e68ed5b66
diff --git a/configure.ac b/configure.ac
index 5bd834a..0f2106b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2090,9 +2090,9 @@ dnl Do we want to use pre-build binary tarball for
recompile
dnl ===================================================================
if test "$enable_library_bin_tar" = "yes" ; then
- USE_LIBRARY_BIN_TAR=YES
+ USE_LIBRARY_BIN_TAR=TRUE
else
- USE_LIBRARY_BIN_TAR=NO
+ USE_LIBRARY_BIN_TAR=
fi
AC_SUBST(USE_LIBRARY_BIN_TAR)
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 5416ce4..6021acb 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -253,7 +253,7 @@ endef
#
# gb_UnpackedTarball_set_tarball unpacked tarball-name
define gb_UnpackedTarball_set_tarball
-$(if $(findstring YES,$(USE_LIBRARY_BIN_TAR)),
+$(if $(USE_LIBRARY_BIN_TAR),
$(if $(4),
$(if $(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l
"$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s
"$(SRCDIR)" -t "$(2)" -m verify -p "$(OS)_$(CPUNAME)"),
$(call gb_UnpackedTarball_set_tarball_internal,$(1),$(shell
"$(SRCDIR)/solenv/bin/bin_library_info.sh" -l
"$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s
"$(SRCDIR)" -t "$(2)" -m verify -p "$(OS)_$(CPUNAME)"),$(3),$(4),in),\
commit 7e73edc5b628982bb78ef26f17fd1bbe3ec34ca4
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 23:02:52 2014 +0100
normalize values of BUILD_UNOWINREG
Change-Id: Iedbab675ffd10c6d353c44d99ddb4d32133d0717
diff --git a/configure.ac b/configure.ac
index 30148ca..5bd834a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7416,12 +7416,12 @@ if test "$enable_odk" = "" -o "$enable_odk" != "no";
then
fi
if test "$enable_build_unowinreg" = "" -o "$enable_build_unowinreg" =
"no"; then
AC_MSG_RESULT([no])
- BUILD_UNOWINREG=NO
+ BUILD_UNOWINREG=
else
AC_MSG_RESULT([yes])
- BUILD_UNOWINREG=YES
+ BUILD_UNOWINREG=TRUE
fi
- if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "YES"; then
+ if test "$_os" != "WINNT" -a "$BUILD_UNOWINREG" = "TRUE"; then
if test -z "$with_mingw_cross_compiler"; then
dnl Guess...
AC_CHECK_PROGS(MINGWCXX,i386-mingw32msvc-g++
i586-pc-mingw32-g++ i686-pc-mingw32-g++ i686-w64-mingw32-g++,false)
@@ -7450,7 +7450,7 @@ if test "$enable_odk" = "" -o "$enable_odk" != "no"; then
BUILD_TYPE="$BUILD_TYPE ODK"
else
AC_MSG_RESULT([no])
- BUILD_UNOWINREG=NO
+ BUILD_UNOWINREG=
fi
AC_SUBST(BUILD_UNOWINREG)
AC_SUBST(MINGWCXX)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 32bdfc1..50da7d2 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -41,7 +41,7 @@ endif
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,odk,\
- $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
+ $(if $(and $(BUILD_UNOWINREG),$(filter
GCC,$(COM))),CustomTarget_unowinreg)\
CustomTarget_classes \
CustomTarget_javadoc \
GeneratedPackage_odk_javadoc \
diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk
index a62ddad..189967e 100644
--- a/odk/Package_unowinreg.mk
+++ b/odk/Package_unowinreg.mk
@@ -7,14 +7,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-ifeq ($(BUILD_UNOWINREG),YES)
+ifneq ($(BUILD_UNOWINREG),)
ifeq ($(COM),MSC)
odk_unowinreg_DIR := $(WORKDIR)/LinkTarget/Library
else
odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg)
endif
odk_unowinreg_FILE := unowinreg.dll
-else # BUILD_UNOWINREG=NO
+else # !BUILD_UNOWINREG
odk_unowinreg_DIR := $(TARFILE_LOCATION)
odk_unowinreg_FILE := $(UNOWINREG_DLL)
endif
commit 43da172dfee0c6ccc38cd0ed9c5d78d5766f0345
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 22:57:08 2014 +0100
normalize values of BUNDLE_MARIADB
Change-Id: I993640f5d4042a75f64fbdd9a6f1e4157a72f909
diff --git a/configure.ac b/configure.ac
index b6461e5..30148ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8105,7 +8105,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library])
if test "$enable_bundle_mariadb" = "yes"; then
AC_MSG_RESULT([yes])
- BUNDLE_MARIADB=YES
+ BUNDLE_MARIADB=TRUE
LIBMARIADB=lib$(echo "${MARIADB_LIBS}" | sed -e
's/[[[:space:]]]\+-l/\n/g' | grep -E '(mysqlclient|mariadb)')
if test "$_os" = "Darwin"; then
LIBMARIADB=${LIBMARIADB}.dylib
@@ -8125,7 +8125,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
fi
else
AC_MSG_RESULT([no])
- BUNDLE_MARIADB=NO
+ BUNDLE_MARIADB=
fi
else
AC_MSG_RESULT([internal])
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk
b/mysqlc/Extension_mysql-connector-ooo.mk
index a4a2232..f6ce30a 100644
--- a/mysqlc/Extension_mysql-connector-ooo.mk
+++ b/mysqlc/Extension_mysql-connector-ooo.mk
@@ -26,7 +26,7 @@ ifeq ($(SYSTEM_MYSQL_CPPCONN),)
$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn))
endif
-ifeq ($(BUNDLE_MARIADB),YES)
+ifneq ($(BUNDLE_MARIADB),)
$(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
$(LIBMARIADB_PATH)/$(LIBMARIADB) \
))
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 01de4e4..656b5dc 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -40,8 +40,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\
-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
$(if $(SYSTEM_MYSQL_CPPCONN),,\
-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\")
\
- $(if $(filter YES,$(BUNDLE_MARIADB)),\
- -DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
+ $(if $(BUNDLE_MARIADB),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
))
$(eval $(call gb_Library_add_exception_objects,mysqlc,\
commit 3cf4aecbb163480e4a425a27ca7c842e4220720d
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 22:52:39 2014 +0100
normalize values of HSQLDB_USE_JDBC_4_1
Change-Id: Ifdbd07db813fd5c8dc02ebd04aea8086ff333411
diff --git a/configure.ac b/configure.ac
index b3506f7..b6461e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8236,7 +8236,7 @@ else
javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f
$SRC_ROOT/solenv/bin/getcompver.awk`
if expr "$javanumver" '>=' 000100060000 > /dev/null; then
AC_MSG_RESULT([yes])
- HSQLDB_USE_JDBC_4_1=YES
+ HSQLDB_USE_JDBC_4_1=TRUE
else
AC_MSG_RESULT([no])
fi
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk
b/external/hsqldb/UnpackedTarball_hsqldb.mk
index a13aa9b..0906647 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/i104901.patch \
external/hsqldb/patches/fdo36824.patch \
external/hsqldb/patches/limit_as_table_alias.patch \
- $(if $(filter YES,$(HSQLDB_USE_JDBC_4_1)),\
+ $(if $(HSQLDB_USE_JDBC_4_1),\
external/hsqldb/patches/jdbc-4.1.patch \
) \
))
commit ad40015ac4eb17e9b2bd337ec81b745cfede5b5b
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 22:48:20 2014 +0100
normalize values of WITH_GSSAPI/WITH_KRB5
Change-Id: I72c67d5a4987f25ddfa21d93a89b0ceae40c9e81
diff --git a/configure.ac b/configure.ac
index b8a1b8f..b3506f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8278,13 +8278,13 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
else
# if/when anything else than PostgreSQL uses Kerberos,
# move this out of `test "x$enable_postgresql_sdbc" != "xno"'
- WITH_KRB5=NO
- WITH_GSSAPI=no
+ WITH_KRB5=
+ WITH_GSSAPI=
case "$_os" in
Darwin)
# MacOS X has system MIT Kerberos 5 since 10.4
if test "$with_krb5" != "no"; then
- WITH_KRB5=YES
+ WITH_KRB5=TRUE
save_LIBS=$LIBS
AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5
'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
[AC_MSG_ERROR([could not find function 'com_err' required
for Kerberos 5, try installing libcom_err devel package])])
@@ -8296,7 +8296,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
LIBS=$save_LIBS
fi
if test "$with_gssapi" != "no"; then
- WITH_GSSAPI=YES
+ WITH_GSSAPI=TRUE
save_LIBS=$LIBS
AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi
-lkrb5 -lcrypto'], [],
[AC_MSG_ERROR([could not find function
'gss_init_sec_context' required for GSSAPI])])
@@ -8311,7 +8311,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
;;
Linux|GNU|*BSD|DragonFly)
if test "$with_krb5" != "no"; then
- WITH_KRB5=YES
+ WITH_KRB5=TRUE
save_LIBS=$LIBS
AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5
'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
[AC_MSG_ERROR([could not find function 'com_err' required
for Kerberos 5])])
@@ -8323,7 +8323,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
LIBS=$save_LIBS
fi
if test "$with_gssapi" != "no"; then
- WITH_GSSAPI=YES
+ WITH_GSSAPI=TRUE
save_LIBS=$LIBS
AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi
-lkrb5 -lcrypto'], [],
[AC_MSG_ERROR([could not find function
'gss_init_sec_context' required for GSSAPI])])
@@ -8333,7 +8333,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
;;
*)
if test "$with_krb5" = "yes"; then
- WITH_KRB5=YES
+ WITH_KRB5=TRUE
save_LIBS=$LIBS
AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5
'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
[AC_MSG_ERROR([could not find function 'com_err' required
for Kerberos 5])])
@@ -8345,7 +8345,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
LIBS=$save_LIBS
fi
if test "$with_gssapi" = "yes"; then
- WITH_GSSAPI=YES
+ WITH_GSSAPI=TRUE
save_LIBS=$LIBS
AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi
-lkrb5 -lcrypto'], [],
[AC_MSG_ERROR([could not find function
'gss_init_sec_context' required for GSSAPI])])
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk
b/connectivity/Library_postgresql-sdbc-impl.mk
index d8a888c..7c1ede9 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -56,8 +56,8 @@ ifeq ($(SYSTEM_POSTGRESQL),)
ifneq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
- $(if $(filter YES,$(WITH_GSSAPI)),$(GSSAPI_LIBS)) \
- $(if $(filter YES,$(WITH_KRB5)),$(KRB5_LIBS)) \
+ $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
+ $(if $(WITH_KRB5),$(KRB5_LIBS)) \
$(if $(filter-out MACOSX,$(OS)),-ldl) \
$(if $(filter-out MACOSX,$(OS)),-lpthread) \
))
diff --git a/external/postgresql/ExternalProject_postgresql.mk
b/external/postgresql/ExternalProject_postgresql.mk
index 557dc48..42fa12f 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -56,8 +56,8 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
--without-readline --disable-shared --with-ldap \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_OPENSSL),,--with-openssl \
- $(if $(filter YES,$(WITH_KRB5)), --with-krb5) \
- $(if $(filter
YES,$(WITH_GSSAPI)),--with-gssapi)) \
+ $(if $(WITH_KRB5), --with-krb5) \
+ $(if $(WITH_GSSAPI),--with-gssapi)) \
CPPFLAGS="$(postgresql_CPPFLAGS)" \
LDFLAGS="$(postgresql_LDFLAGS)" \
EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3
-lnssutil3 -lplds4 -lplc4 -lnspr4" \
commit d744bcae5da339a1d365e37a4223212ae3560f7e
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 10 22:41:42 2014 +0100
normalize values of BUILD_POSTGRESQL_SDBC
Change-Id: Iab7ef9ef27ea970aded726a8c8d2c46267454a64
diff --git a/configure.ac b/configure.ac
index cdae8b5..b8a1b8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8381,7 +8381,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
CPPFLAGS=$save_CPPFLAGS
LIBS=$save_LIBS
fi
- BUILD_POSTGRESQL_SDBC=YES
+ BUILD_POSTGRESQL_SDBC=TRUE
fi
AC_SUBST(WITH_KRB5)
AC_SUBST(WITH_GSSAPI)
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index ae3511c..8d2253c 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -92,7 +92,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
+ifneq ($(BUILD_POSTGRESQL_SDBC),)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_postgresql \
Library_postgresql-sdbc \
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 092f3ed..6764568 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -430,7 +430,7 @@ postprocess_FILES_xsltfilter := \
$(call gb_XcuFilterFiltersTarget_get_target,fcfg_xslt_filters.xcu) \
$(call gb_XcuFilterTypesTarget_get_target,fcfg_xslt_types.xcu)
-ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
+ifneq ($(BUILD_POSTGRESQL_SDBC),)
postprocess_XCDS += postgresql.xcd
postprocess_DEPS_postgresql := main
postprocess_FILES_postgresql := $(call
gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
