Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
c3a586a7
Kaydet (Commit)
c3a586a7
authored
Eki 28, 2012
tarafından
Matúš Kukan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
openldap: convert to gbuild
Change-Id: Ic1c4c58a09fd41bce78731e61349baa129f5e935
üst
eb28dd59
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
123 additions
and
83 deletions
+123
-83
Makefile.top
Makefile.top
+1
-1
Module_tail_build.mk
Module_tail_build.mk
+1
-0
RepositoryExternal.mk
RepositoryExternal.mk
+3
-1
RepositoryModule_ooo.mk
RepositoryModule_ooo.mk
+1
-0
config_host.mk.in
config_host.mk.in
+1
-0
configure.ac
configure.ac
+3
-3
ooo.lst.in
ooo.lst.in
+1
-1
ExternalPackage_openldap.mk
openldap/ExternalPackage_openldap.mk
+20
-0
ExternalProject_openldap.mk
openldap/ExternalProject_openldap.mk
+42
-0
Makefile
openldap/Makefile
+7
-0
Module_openldap.mk
openldap/Module_openldap.mk
+22
-0
UnpackedTarball_openldap.mk
openldap/UnpackedTarball_openldap.mk
+18
-0
makefile.mk
openldap/makefile.mk
+0
-76
dmake
openldap/prj/dmake
+0
-0
ExternalProject_postgresql.mk
postgresql/ExternalProject_postgresql.mk
+2
-0
build.lst
tail_build/prj/build.lst
+1
-1
No files found.
Makefile.top
Dosyayı görüntüle @
c3a586a7
...
...
@@ -126,6 +126,7 @@ offapi\
officecfg
\
oovbaapi
\
oox
\
openldap
\
package
\
packimages
\
padmin
\
...
...
@@ -238,7 +239,6 @@ mysqlc\
mysqlcppconn
\
nss
\
odk
\
openldap
\
openssl
\
pango
\
postprocess
\
...
...
Module_tail_build.mk
Dosyayı görüntüle @
c3a586a7
...
...
@@ -117,6 +117,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
officecfg
\
oovbaapi
\
oox
\
$(
call
gb_Helper_optional
,
OPENLDAP
,
openldap
)
\
package
\
padmin
\
$(
call
gb_Helper_optional
,
POSTGRESQL
,
postgresql
)
\
...
...
RepositoryExternal.mk
Dosyayı görüntüle @
c3a586a7
...
...
@@ -1776,10 +1776,12 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
define gb_LinkTarget__use_openldap
$(call gb_LinkTarget_set_include,$(1),\
-I$(
OUTDIR)/inc/openldap
\
-I$(
call gb_UnpackedTarball_get_dir,openldap/include)
\
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_package,$(1),openldap)
$(call gb_LinkTarget_use_static_libraries,$(1),\
ldap \
lber \
...
...
RepositoryModule_ooo.mk
Dosyayı görüntüle @
c3a586a7
...
...
@@ -125,6 +125,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
officecfg
\
oovbaapi
\
oox
\
$(
call
gb_Helper_optional
,
OPENLDAP
,
openldap
)
\
package
\
packimages
\
padmin
\
...
...
config_host.mk.in
Dosyayı görüntüle @
c3a586a7
...
...
@@ -457,6 +457,7 @@ export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
export OOO_SHELL=@BASH@
export OOO_VENDOR=@OOO_VENDOR@
export OPENLDAP_TARBALL=@OPENLDAP_TARBALL@
export OPENSSL_CFLAGS=@OPENSSL_CFLAGS@
export OPENSSL_LIBS=@OPENSSL_LIBS@
export ORCUS_CFLAGS=@ORCUS_CFLAGS@
...
...
configure.ac
Dosyayı görüntüle @
c3a586a7
...
...
@@ -8064,7 +8064,7 @@ dnl ===================================================================
dnl Check for system openldap
dnl ===================================================================
if test "$_os" != "WINNT"; then
if test "$_os" != "WINNT"
-a "$_os" != "iOS" -a "$_os" != "Android"
; then
AC_MSG_CHECKING([which openldap library to use])
if test "$with_system_openldap" = "yes"; then
AC_MSG_RESULT([external])
...
...
@@ -8075,12 +8075,12 @@ if test "$with_system_openldap" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_OPENLDAP=NO
OPENLDAP_TARBALL="804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"
BUILD_TYPE="$BUILD_TYPE OPENLDAP"
fi
else
SYSTEM_OPENLDAP=NO
fi
AC_SUBST(SYSTEM_OPENLDAP)
AC_SUBST(OPENLDAP_TARBALL)
dnl ===================================================================
dnl Check for system mozilla
...
...
ooo.lst.in
Dosyayı görüntüle @
c3a586a7
...
...
@@ -40,7 +40,6 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
@AFMS_TARBALL@
@APACHE_COMMONS_CODEC_TARBALL@
@APACHE_COMMONS_HTTPCLIENT_TARBALL@
...
...
@@ -82,6 +81,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@MSPUB_TARBALL@
@MYTHES_TARBALL@
@NEON_TARBALL@
@OPENLDAP_TARBALL@
@ORCUS_TARBALL@
@PNG_TARBALL@
@POSTGRESQL_TARBALL@
...
...
openldap/ExternalPackage_openldap.mk
0 → 100644
Dosyayı görüntüle @
c3a586a7
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,openldap,openldap))
$(eval $(call gb_ExternalPackage_use_external_project,openldap,openldap))
$(eval $(call gb_ExternalPackage_add_files,openldap,lib,\
libraries/libldap/.libs/libldap.a \
libraries/libldap_r/.libs/libldap_r.a \
libraries/liblber/.libs/liblber.a \
))
# vim: set noet sw=4 ts=4:
openldap/ExternalProject_openldap.mk
0 → 100644
Dosyayı görüntüle @
c3a586a7
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalProject_ExternalProject,openldap))
$(eval $(call gb_ExternalProject_use_unpacked,openldap,openldap))
$(eval $(call gb_ExternalProject_register_targets,openldap,\
build \
))
$(call gb_ExternalProject_get_state_target,openldap,build) :
cd $(EXTERNAL_WORKDIR) \
&& ./configure \
--disable-slapd \
--with-pic \
--with-tls=moznss \
--without-cyrus-sasl \
--disable-shared \
--enable-static \
$(if $(filter YES,$(CROSS_COMPILING)), \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
--with-yielding_select=yes \
ac_cv_func_memcmp_working=yes \
) \
$(if $(filter YES,$(SYSTEM_NSS)), \
CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
, \
CPPFLAGS="-I $(OUTDIR)/inc/mozilla/nss -I $(OUTDIR)/inc/mozilla/nspr" \
CFLAGS="-I $(OUTDIR)/inc/mozilla/nss -I $(OUTDIR)/inc/mozilla/nspr" \
LDFLAGS="-L$(OUTDIR)/lib" \
) \
&& unset MAKEFLAGS && $(GNUMAKE) -j$(GMAKE_PARALLELISM) \
&& touch $@
# vim: set noet sw=4 ts=4:
openldap/Makefile
0 → 100644
Dosyayı görüntüle @
c3a586a7
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
module_directory
:=
$
(
dir
$
(
realpath
$
(
firstword
$(MAKEFILE_LIST)
)))
include
$(module_directory)/../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:
openldap/Module_openldap.mk
0 → 100644
Dosyayı görüntüle @
c3a586a7
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Module_Module,openldap))
ifeq ($(SYSTEM_OPENLDAP),NO)
$(eval $(call gb_Module_add_targets,openldap,\
ExternalPackage_openldap \
ExternalProject_openldap \
UnpackedTarball_openldap \
))
endif
# vim: set noet sw=4 ts=4:
openldap/UnpackedTarball_openldap.mk
0 → 100644
Dosyayı görüntüle @
c3a586a7
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap))
$(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,openldap,\
openldap/openldap-2.4.31.patch \
))
# vim: set noet sw=4 ts=4:
openldap/makefile.mk
deleted
100644 → 0
Dosyayı görüntüle @
eb28dd59
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
PRJ
=
.
PRJNAME
=
openldap
TARGET
=
so_openldap
# --- Settings -----------------------------------------------------
.INCLUDE
:
settings.mk
.IF
"$(SYSTEM_OPENLDAP)"
==
"YES"
all
:
@
echo
"An already available installation of openldap should exist on your system."
@
echo
"Therefore the version provided here does not need to be built in addition."
.ENDIF
.IF
"$(OS)"
==
"WNT"
||
"$(OS)"
==
"ANDROID"
||
"$(OS)"
==
"IOS"
all
:
@
echo
"Openldap is not needed on Windows, Android or iOS."
.ENDIF
# --- Files --------------------------------------------------------
TARFILE_NAME
=
openldap-2.4.31
TARFILE_MD5
=
804c6cb5698db30b75ad0ff1c25baefd
PATCH_FILES
=
\
$(TARFILE_NAME)
.patch
CONFIGURE_DIR
=
CONFIGURE_ACTION
=
.
$/
configure
CONFIGURE_FLAGS
=
--disable-slapd
--with-pic
--with-tls
=
moznss
--without-cyrus-sasl
--disable-shared
--enable-static
.IF
"$(CROSS_COMPILING)"
==
"YES"
CONFIGURE_FLAGS
+=
--build
=
$(BUILD_PLATFORM)
--host
=
$(HOST_PLATFORM)
--with-yielding_select
=
yes
ac_cv_func_memcmp_working
=
yes
.ENDIF
.IF
"$(SYSTEM_NSS)"
==
"YES"
CONFIGURE_FLAGS
+=
CPPFLAGS
=
"
$(NSS_CFLAGS)
"
CFLAGS
=
"
$(NSS_CFLAGS)
"
LDFLAGS
=
"
$(NSS_LIBS)
"
.ELSE
CONFIGURE_FLAGS
+=
CPPFLAGS
=
"-I
$(SOLARVER)$/$(INPATH)$/
inc
$/
mozilla
$/
nss -I
$(SOLARVER)$/$(INPATH)$/
inc
$/
mozilla
$/
nspr"
CONFIGURE_FLAGS
+=
CFLAGS
=
"-I
$(SOLARVER)$/$(INPATH)$/
inc
$/
mozilla
$/
nss -I
$(SOLARVER)$/$(INPATH)$/
inc
$/
mozilla
$/
nspr"
CONFIGURE_FLAGS
+=
LDFLAGS
=
"-L
$(SOLARVER)$/$(INPATH)$/
lib"
.ENDIF
BUILD_FLAGS
+=
-j
$(EXTMAXPROCESS)
BUILD_DIR
=
$(CONFIGURE_DIR)
BUILD_ACTION
=
$(GNUMAKE)
OUT2INC
+=
include
$/
slapi-plugin.h
OUT2INC
+=
include
$/
ldap_utf8.h
OUT2INC
+=
include
$/
ldap.h
OUT2INC
+=
include
$/
ldap_cdefs.h
OUT2INC
+=
include
$/
ldap_features.h
OUT2INC
+=
include
$/
ldap_schema.h
OUT2INC
+=
include
$/
ldif.h
OUT2INC
+=
include
$/
lber_types.h
OUT2INC
+=
include
$/
lber.h
OUT2LIB
+=
libraries
$/
libldap
$/
.libs
$/
libldap.a
OUT2LIB
+=
libraries
$/
libldap_r
$/
.libs
$/
libldap_r.a
OUT2LIB
+=
libraries
$/
liblber
$/
.libs
$/
liblber.a
# --- Targets ------------------------------------------------------
.INCLUDE
:
set_ext.mk
.INCLUDE
:
target.mk
.INCLUDE
:
tg_ext.mk
openldap/prj/dmake
deleted
100644 → 0
Dosyayı görüntüle @
eb28dd59
postgresql/ExternalProject_postgresql.mk
Dosyayı görüntüle @
c3a586a7
...
...
@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,postgresql))
$(eval $(call gb_ExternalProject_use_unpacked,postgresql,postgresql))
$(eval $(call gb_ExternalProject_use_package,postgresql,openldap))
$(eval $(call gb_ExternalProject_register_targets,postgresql,\
build \
))
...
...
tail_build/prj/build.lst
Dosyayı görüntüle @
c3a586a7
tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPEN
LDAP:openldap OPEN
SSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment