[Libreoffice-commits] core.git: 6 commits - bin/module-deps.pl config_host.mk.in configure.ac connectivity/Library_postgresql-sdbc-impl.mk forms/Module_forms.mk postgresql/ExternalProject_postgresql.mk RepositoryModule_host.mk solenv/bin solenv/gbuild
Peter Foley
pefoley2 at verizon.net
Tue Mar 26 08:40:31 PDT 2013
RepositoryModule_host.mk | 2 +-
bin/module-deps.pl | 2 +-
config_host.mk.in | 2 ++
configure.ac | 11 +++++++++++
connectivity/Library_postgresql-sdbc-impl.mk | 13 ++++++++-----
forms/Module_forms.mk | 2 --
postgresql/ExternalProject_postgresql.mk | 3 +--
solenv/bin/modules/installer/epmfile.pm | 6 +++---
solenv/bin/ooinstall | 2 +-
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
solenv/gbuild/gbuild.mk | 2 +-
solenv/gbuild/partial_build.mk | 7 ++++++-
12 files changed, 36 insertions(+), 17 deletions(-)
New commits:
commit a5b669de8431377c43909e30d9e9d01a18a5b58a
Author: Peter Foley <pefoley2 at verizon.net>
Date: Tue Mar 26 11:23:02 2013 -0400
make linkoo work in separate builddir
Change-Id: I1c9ca490716fc0dc5951bd032d54a102541087c7
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 31025b6..b9d52e5 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -130,7 +130,7 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) {
print "Installer finished\n";
if ($do_link && !$is_windows) {
- system("$ENV{SOLARENV}/bin/linkoo $path $ENV{SRC_ROOT}") &&
+ system("$ENV{SOLARENV}/bin/linkoo $path $ENV{BUILDDIR}") &&
die "linkoo failed: $!";
}
commit 207e370a167b7856346c1bff0c735cd2688e2e6e
Author: Peter Foley <pefoley2 at verizon.net>
Date: Tue Mar 26 11:10:25 2013 -0400
make partial_build work in separate builddir
Change-Id: Ib5290a3e76170946ce3a8aac113b01d1ec54fac5
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 9c7f3fb..8107bb2 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,8 +1,13 @@
ifeq ($(gb_Side),)
gb_Side:=host
endif
+
+ifeq (,$(BUILDDIR))
+BUILDDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))../..
+endif
+
ifeq ($(SOLARENV),)
-include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../../config_$(gb_Side).mk
+include $(BUILDDIR)/config_$(gb_Side).mk
endif
gb_PARTIAL_BUILD := T
commit 469bb100d690d03b627dce48253a796a8f8cce68
Author: Peter Foley <pefoley2 at verizon.net>
Date: Tue Mar 26 11:02:52 2013 -0400
avoid getcwd redefined warning
Change-Id: Idd788dad8c2b5e2689a17b571104d0fe04accfd1
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 7ee6d13..4ea85b6 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -18,7 +18,7 @@
package installer::epmfile;
-use Cwd;
+use Cwd qw();
use installer::converter;
use installer::exiter;
use installer::files;
@@ -1111,7 +1111,7 @@ sub set_topdir_in_specfile
{
my ($changefile, $filename, $newepmdir) = @_;
- $newepmdir = cwd() . $installer::globals::separator . $newepmdir; # only absolute path allowed
+ $newepmdir = Cwd::cwd() . $installer::globals::separator . $newepmdir; # only absolute path allowed
# removing "%define _topdir", if existing
@@ -2070,7 +2070,7 @@ sub create_packages_without_epm
if ( $rpmversion >= 4 )
{
- my $dir = getcwd;
+ my $dir = Cwd::getcwd;
my $buildroot = $dir . "/" . $epmdir . "buildroot/";
$buildrootstring = "--buildroot=$buildroot";
mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
commit ea360ff3ad9dac359f707cee5f0ca6548a7cd5d5
Author: Peter Foley <pefoley2 at verizon.net>
Date: Tue Mar 26 11:02:06 2013 -0400
add frm to Library_merged
Change-Id: I72fff5fe1fd26e618ffe89111471d95cd4d30852
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e28c9ae..a2be8b8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -79,7 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
fileaccess \
filter \
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
- forms \
+ $(call gb_Helper_optional,DBCONNECTIVITY,forms) \
formula \
fpicker \
framework \
diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk
index 7480767..bd64ac1 100644
--- a/forms/Module_forms.mk
+++ b/forms/Module_forms.mk
@@ -28,7 +28,6 @@
$(eval $(call gb_Module_Module,forms))
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,forms,\
AllLangResTarget_frm \
Library_frm \
@@ -38,6 +37,5 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
JunitTest_forms_unoapi \
JunitTest_forms_complex \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 117c0df..2217014 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -45,6 +45,7 @@ gb_MERGEDLIBS := \
filterconfig \
for \
forui \
+ $(call gb_Helper_optional,DBCONNECTIVITY,frm) \
fsstorage \
fwe \
fwi \
commit 4dd7010c007c89497b0b684ee4dbf699c2be1ee4
Author: Peter Foley <pefoley2 at verizon.net>
Date: Mon Mar 25 21:27:10 2013 -0400
don't build postgresql just to parse the makefiles
When running module-deps.pl postgresql gets built just so that
libpq-flags.mk can be included. Since we already have all the necessary
libraries, add them explicitly and avoid this.
Change-Id: Icd94fc215ecb26c95f9ae3c14625bf819bf3c5c3
diff --git a/config_host.mk.in b/config_host.mk.in
index 5e68b41..354dc3a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -195,6 +195,7 @@ export GPERF=@GPERF@
export GRAPHITE_CFLAGS=$(gb_SPACE)@GRAPHITE_CFLAGS@
export GRAPHITE_LIBS=$(gb_SPACE)@GRAPHITE_LIBS@
@x_Cygwin@ export GREP=@WIN_GREP@
+export GSSAPI_LIBS=@GSSAPI_LIBS@
export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@
export GSTREAMER_0_10_LIBS=$(gb_SPACE)@GSTREAMER_0_10_LIBS@
export GSTREAMER_CFLAGS=$(gb_SPACE)@GSTREAMER_CFLAGS@
@@ -276,6 +277,7 @@ export KDE_GLIB_CFLAGS=$(gb_SPACE)@KDE_GLIB_CFLAGS@
export KDE_GLIB_LIBS=$(gb_SPACE)@KDE_GLIB_LIBS@
export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
export KDE_LIBS=$(gb_SPACE)@KDE_LIBS@
+export KRB5_LIBS=@KRB5_LIBS@
export L10N_MODULE=@L10N_MODULE@
export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
diff --git a/configure.ac b/configure.ac
index 5397ed4..5127e5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7793,9 +7793,11 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
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])])
+ KRB5_LIBS=$LIBS
LIBS=$save_LIBS
AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
[AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5, try installing krb5 devel package])])
+ KRB5_LIBS="$KRB5_LIBS $LIBS"
LIBS=$save_LIBS
fi
if test "$with_gssapi" != "no"; then
@@ -7803,6 +7805,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
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])])
+ GSSAPI_LIBS=$LIBS
LIBS=$save_LIBS
fi
;;
@@ -7817,9 +7820,11 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
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])])
+ KRB5_LIBS=$LIBS
LIBS=$save_LIBS
AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
[AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
+ KRB5_LIBS="$KRB5_LIBS $LIBS"
LIBS=$save_LIBS
fi
if test "$with_gssapi" != "no"; then
@@ -7827,6 +7832,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
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])])
+ GSSAPI_LIBS=$LIBS
LIBS=$save_LIBS
fi
;;
@@ -7836,9 +7842,11 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
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])])
+ KRB5_LIBS=$LIBS
LIBS=$save_LIBS
AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
[AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
+ KRB5_LIBS="$KRB5_LIBS $LIBS"
LIBS=$save_LIBS
fi
if test "$with_gssapi" = "yes"; then
@@ -7847,6 +7855,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
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])])
LIBS=$save_LIBS
+ GSSAPI_LIBS=$LIBS
fi
esac
@@ -7881,6 +7890,8 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
fi
AC_SUBST(WITH_KRB5)
AC_SUBST(WITH_GSSAPI)
+AC_SUBST(GSSAPI_LIBS)
+AC_SUBST(KRB5_LIBS)
AC_SUBST(BUILD_POSTGRESQL_SDBC)
AC_SUBST(SYSTEM_POSTGRESQL)
AC_SUBST(POSTGRESQL_INC)
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 37c4074..d733f01 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -60,18 +60,21 @@ endif
$(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
boost_headers \
postgresql \
+ openssl \
+ openldap \
+ nss3 \
+ plc4 \
+ ssl3 \
))
ifneq ($(SYSTEM_POSTGRESQL),YES)
ifneq ($(OS)$(COM),WNTMSC)
--include $(OUTDIR)/inc/postgresql/libpq-flags.mk
-
$(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
- $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--as-needed) \
- $(LIBPQ_DEP_LIBS) \
+ $(if $(filter YES,$(WITH_GSSAPI)),$(GSSAPI_LIBS)) \
+ $(if $(filter YES,$(WITH_KRB5)),$(KRB5_LIBS)) \
$(if $(filter-out MACOSX,$(OS)),-ldl) \
- $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--no-as-needed) \
+ $(if $(filter-out MACOSX,$(OS)),-lpthread) \
))
endif
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index 5fef28e..19c10e3 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -44,8 +44,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
) \
&& cd src/interfaces/libpq \
- && MAKEFLAGS= && $(MAKE) all-static-lib libpq-flags.mk \
- )
+ && MAKEFLAGS= && $(MAKE) all-static-lib)
endif
commit 406dfa3240249d3611743ec2cee1b644a3c56291
Author: Peter Foley <pefoley2 at verizon.net>
Date: Mon Mar 25 21:18:49 2013 -0400
speed-up module-deps.pl
Change-Id: Idf703b1b5e26e32a0e8276c6f2eba51cd80f1b0b
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index 4ed9ca8..a46634a 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -32,7 +32,7 @@ sub read_deps()
if (defined $from_file) {
open ($p, $from_file) || die "can't read deps from cache file: $!";
} else {
- open ($p, "ENABLE_PRINT_DEPS=1 $gnumake -n -f $makefile_build all|") || die "can't launch make: $!";
+ open ($p, "ENABLE_PRINT_DEPS=1 $gnumake -q -f $makefile_build all|") || die "can't launch make: $!";
}
$|=1;
print STDERR "reading deps ";
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index f914c00..5a4161e 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -153,7 +153,7 @@ else
gb_ENABLE_PCH := $(false)
endif
-ifneq ($(nodep),)
+ifneq ($(nodep)$(ENABLE_PRINT_DEPS),)
gb_FULLDEPS := $(false)
else
gb_FULLDEPS := $(true)
More information about the Libreoffice-commits
mailing list