Kaydet (Commit) 0f075129 authored tarafından Peter Foley's avatar Peter Foley

convert curl to gbuild

Change-Id: I8c038a0c59660f4fb672d71c08e6ee0b56c302ee
üst a3d92536
...@@ -64,6 +64,7 @@ cppuhelper\ ...@@ -64,6 +64,7 @@ cppuhelper\
cpputools\ cpputools\
ct2n\ ct2n\
cui\ cui\
curl\
dbaccess\ dbaccess\
desktop\ desktop\
dictionaries \ dictionaries \
...@@ -215,7 +216,6 @@ binfilter \ ...@@ -215,7 +216,6 @@ binfilter \
cairo\ cairo\
cppunit\ cppunit\
crashrep\ crashrep\
curl\
external\ external\
gdk-pixbuf\ gdk-pixbuf\
gettext\ gettext\
......
...@@ -56,6 +56,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ ...@@ -56,6 +56,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
cpputools \ cpputools \
$(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CT2N,ct2n) \
cui \ cui \
$(call gb_Helper_optional,CURL,curl) \
dbaccess \ dbaccess \
desktop \ desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \ $(call gb_Helper_optional,DICTIONARIES,dictionaries) \
......
...@@ -61,6 +61,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ ...@@ -61,6 +61,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
cpputools \ cpputools \
$(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,CT2N,ct2n) \
cui \ cui \
$(call gb_Helper_optional,CURL,curl) \
dbaccess \ dbaccess \
desktop \ desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \ $(call gb_Helper_optional,DICTIONARIES,dictionaries) \
......
...@@ -84,6 +84,7 @@ export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@ ...@@ -84,6 +84,7 @@ export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
export CPU_FOR_BUILD=@CPU_FOR_BUILD@ export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@ export CROSS_COMPILING=@CROSS_COMPILING@
export CT2N_TARBALL=@CT2N_TARBALL@ export CT2N_TARBALL=@CT2N_TARBALL@
export CURL_TARBALL=@CURL_TARBALL@
export CURL_CFLAGS=@CURL_CFLAGS@ export CURL_CFLAGS=@CURL_CFLAGS@
export CURL_LIBS=@CURL_LIBS@ export CURL_LIBS=@CURL_LIBS@
export CXX=@CXX@ export CXX=@CXX@
......
...@@ -7892,9 +7892,11 @@ if test "$with_system_curl" = "yes"; then ...@@ -7892,9 +7892,11 @@ if test "$with_system_curl" = "yes"; then
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_CURL=NO SYSTEM_CURL=NO
CURL_TARBALL="3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz"
BUILD_TYPE="$BUILD_TYPE CURL" BUILD_TYPE="$BUILD_TYPE CURL"
fi fi
AC_SUBST(SYSTEM_CURL) AC_SUBST(SYSTEM_CURL)
AC_SUBST(CURL_TARBALL)
AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS) AC_SUBST(CURL_LIBS)
AC_SUBST([MINGW_CURL_DLL]) AC_SUBST([MINGW_CURL_DLL])
......
# -*- 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,curl,curl))
$(eval $(call gb_ExternalPackage_use_external_project,curl,curl))
ifeq ($(GUI),UNX)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/pkgconfig/libcurl.pc,libcurl.pc))
endif
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a))
else ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,.libs/libcurl.so))
else
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
endif
else ifeq ($(GUI),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a))
$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,.libs/libcurl.dll))
else ifeq ($(COM),WNT)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib))
$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/libcurl.dll))
endif
endif
# vim: set noet sw=4 ts=4:
# -*- 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,curl))
$(eval $(call gb_ExternalProject_use_unpacked,curl,curl))
$(eval $(call gb_ExternalProject_register_targets,curl,\
build \
))
ifeq ($(GUI),UNX)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \
&& ./configure --with-nss --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include" LDFLAGS="-L$(SYSBASE)/usr/lib") \
&& cd lib \
&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
&& touch $@
else ifeq ($(GUI),WNT)
ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \
&& ./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))" \
LDFLAGS="$(patsubst ;, -L,$(ILIB))" \
CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" \
&& cd lib \
&& $(GNUMAKE) -j$(EXTMAXPROCESS) \
&& touch $@
else ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR)/lib \
&& unset MAKEFLAGS \
&& export LIB="$(ILIB)" \
&& nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
&& touch $@
endif
endif
# vim: set noet sw=4 ts=4:
# -*- 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:
# -*- 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,curl))
ifeq ($(SYSTEM_CURL),NO)
$(eval $(call gb_Module_add_targets,curl,\
UnpackedTarball_curl \
ExternalPackage_curl \
ExternalProject_curl \
))
endif
# vim: set noet sw=4 ts=4:
# -*- 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,curl))
$(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
Makefile.msvc.names \
lib/Makefile.vc9 \
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
curl/curl-7.26.0.patch \
curl/curl-7.26.0_nspr.patch \
curl/curl-aix.patch \
curl/curl-7.26.0_win.patch \
curl/curl-7.26.0_mingw.patch \
))
ifeq ($(OS),ANDROID)
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
curl/curl-android.patch \
))
endif
# vim: set noet sw=4 ts=4:
--- misc/curl-7.26.0/lib/setup.h 2009-10-29 05:21:58.000000000 +0900 --- curl-7.26.0/lib/setup.h 2009-10-29 05:21:58.000000000 +0900
+++ misc/build/curl-7.26.0/lib/setup.h 2010-03-02 06:03:10.009500000 +0900 +++ misc/build/curl-7.26.0/lib/setup.h 2010-03-02 06:03:10.009500000 +0900
@@ -40,6 +40,21 @@ @@ -40,6 +40,21 @@
......
--- misc/curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600 --- curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600
+++ misc/build/curl-7.26.0/Makefile.msvc.names 2012-07-02 07:20:39.323448800 -0600 +++ misc/build/curl-7.26.0/Makefile.msvc.names 2012-07-02 07:20:39.323448800 -0600
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
!ENDIF !ENDIF
...@@ -32,3 +32,21 @@ ...@@ -32,3 +32,21 @@
!ENDIF !ENDIF
# -------------------------------------- # --------------------------------------
--- curl/lib/Makefile.vc9 2012-05-24 12:07:02.000000000 -0400
+++ curl/lib/Makefile.vc9 2012-10-29 11:53:44.658809300 -0400
@@ -117,7 +117,7 @@
ZLIBLIBSDLL= zdll.lib
ZLIBLIBS = zlib.lib
WINLIBS = ws2_32.lib wldap32.lib
-CFLAGS = $(CFLAGS)
+CFLAGS = $(CFLAGS) $(EXCFLAGS)
CFGSET = FALSE
@@ -620,5 +620,5 @@
release-dll-ssl-dll\libcurl.res \
release-dll-zlib-dll\libcurl.res \
release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
- rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc
+ rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc
!ENDIF # End of case where a config was provided.
mkdir: %_DEST%\inc\external\curl
..\%__SRC%\inc\easy.h %_DEST%\inc\external\curl\easy.h
..\%__SRC%\inc\curlver.h %_DEST%\inc\external\curl\curlver.h
..\%__SRC%\inc\curl.h %_DEST%\inc\external\curl\curl.h
..\%__SRC%\inc\mprintf.h %_DEST%\inc\external\curl\mprintf.h
..\%__SRC%\inc\multi.h %_DEST%\inc\external\curl\multi.h
..\%__SRC%\inc\stdcheaders.h %_DEST%\inc\external\curl\stdcheaders.h
..\%__SRC%\inc\typecheck-gcc.h %_DEST%\inc\external\curl\typecheck-gcc.h
..\%__SRC%\inc\curlbuild.h %_DEST%\inc\external\curl\curlbuild.h
..\%__SRC%\inc\curlrules.h %_DEST%\inc\external\curl\curlrules.h
mkdir: %_DEST%\lib\pkgconfig
..\%__SRC%\inc\libcurl.pc %_DEST%\lib\pkgconfig\libcurl.pc
..\%__SRC%\bin\libcurl*.dll %_DEST%\bin\*.dll
..\%__SRC%\lib\libcurl.* %_DEST%\lib\libcurl.*
linklib: libcurl.*.*
...@@ -14,7 +14,6 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz ...@@ -14,7 +14,6 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
...@@ -50,6 +49,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 ...@@ -50,6 +49,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@CLUCENE_TARBALL@ @CLUCENE_TARBALL@
@CMIS_TARBALL@ @CMIS_TARBALL@
@CT2N_TARBALL@ @CT2N_TARBALL@
@CURL_TARBALL@
@EPM_TARBALL@ @EPM_TARBALL@
@EXPAT_TARBALL@ @EXPAT_TARBALL@
@FONT_DEJAVU_TARBALL@ @FONT_DEJAVU_TARBALL@
......
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 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 : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf 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 tb tail_build\prj nmake - all tb_prj NULL
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment