summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-10-17 19:28:04 +0200
committerDavid Tardon <dtardon@redhat.com>2013-10-18 06:50:42 +0000
commita777285f9b8efc4e00183a25d39913f78eddc0ad (patch)
treed27b5a2462fde325792008715e2e94788da05bde
parent39f73d93874114e2bacfd73da137180aad95a3f6 (diff)
fdo#70393: move curl to a subdir of external
Change-Id: I76401636aab7d4de198912b154d6ec3da35a711d Reviewed-on: https://gerrit.libreoffice.org/6298 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/curl/ExternalPackage_curl.mk (renamed from curl/ExternalPackage_curl.mk)0
-rw-r--r--external/curl/ExternalProject_curl.mk (renamed from curl/ExternalProject_curl.mk)0
-rw-r--r--external/curl/Makefile (renamed from curl/Makefile)0
-rw-r--r--external/curl/Module_curl.mk (renamed from curl/Module_curl.mk)2
-rw-r--r--external/curl/README (renamed from curl/README)0
-rw-r--r--external/curl/UnpackedTarball_curl.mk (renamed from curl/UnpackedTarball_curl.mk)16
-rw-r--r--external/curl/curl-7.26.0.patch (renamed from curl/curl-7.26.0.patch)0
-rw-r--r--external/curl/curl-7.26.0_mingw.patch (renamed from curl/curl-7.26.0_mingw.patch)0
-rw-r--r--external/curl/curl-7.26.0_nspr.patch (renamed from curl/curl-7.26.0_nspr.patch)0
-rw-r--r--external/curl/curl-7.26.0_strlcat.patch (renamed from curl/curl-7.26.0_strlcat.patch)0
-rw-r--r--external/curl/curl-7.26.0_win-proxy.patch (renamed from curl/curl-7.26.0_win-proxy.patch)0
-rw-r--r--external/curl/curl-7.26.0_win.patch (renamed from curl/curl-7.26.0_win.patch)0
-rw-r--r--external/curl/curl-aix.patch (renamed from curl/curl-aix.patch)0
-rw-r--r--external/curl/curl-android.patch (renamed from curl/curl-android.patch)0
16 files changed, 9 insertions, 11 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e88deaf0a8f9..96091c1dc2fd 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cpputools \
$(call gb_Helper_optional,CRASHREP,crashrep) \
cui \
- $(call gb_Helper_optional,CURL,curl) \
dbaccess \
desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 9be3b5a20c24..8d5232bcc9df 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional,CT2N,ct2n) \
+ $(call gb_Helper_optional,CURL,curl) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
))
diff --git a/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 5f552602baf0..5f552602baf0 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
diff --git a/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 23dce1170044..23dce1170044 100644
--- a/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
diff --git a/curl/Makefile b/external/curl/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/curl/Makefile
+++ b/external/curl/Makefile
diff --git a/curl/Module_curl.mk b/external/curl/Module_curl.mk
index 2f9c4b2a9403..2b4c61c04ac9 100644
--- a/curl/Module_curl.mk
+++ b/external/curl/Module_curl.mk
@@ -9,12 +9,10 @@
$(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:
diff --git a/curl/README b/external/curl/README
index 292e4edf57b6..292e4edf57b6 100644
--- a/curl/README
+++ b/external/curl/README
diff --git a/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index f90007f60f0f..aa3e41302f88 100644
--- a/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -18,17 +18,17 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
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 \
- curl/curl-7.26.0_win-proxy.patch \
- curl/curl-7.26.0_strlcat.patch \
+ external/curl/curl-7.26.0.patch \
+ external/curl/curl-7.26.0_nspr.patch \
+ external/curl/curl-aix.patch \
+ external/curl/curl-7.26.0_win.patch \
+ external/curl/curl-7.26.0_mingw.patch \
+ external/curl/curl-7.26.0_win-proxy.patch \
+ external/curl/curl-7.26.0_strlcat.patch \
))
ifeq ($(OS),ANDROID)
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
- curl/curl-android.patch \
+ external/curl/curl-android.patch \
))
endif
# vim: set noet sw=4 ts=4:
diff --git a/curl/curl-7.26.0.patch b/external/curl/curl-7.26.0.patch
index 6cebdc17bbd7..6cebdc17bbd7 100644
--- a/curl/curl-7.26.0.patch
+++ b/external/curl/curl-7.26.0.patch
diff --git a/curl/curl-7.26.0_mingw.patch b/external/curl/curl-7.26.0_mingw.patch
index 79318732a69b..79318732a69b 100644
--- a/curl/curl-7.26.0_mingw.patch
+++ b/external/curl/curl-7.26.0_mingw.patch
diff --git a/curl/curl-7.26.0_nspr.patch b/external/curl/curl-7.26.0_nspr.patch
index 4eee75e2c62c..4eee75e2c62c 100644
--- a/curl/curl-7.26.0_nspr.patch
+++ b/external/curl/curl-7.26.0_nspr.patch
diff --git a/curl/curl-7.26.0_strlcat.patch b/external/curl/curl-7.26.0_strlcat.patch
index c5536f822641..c5536f822641 100644
--- a/curl/curl-7.26.0_strlcat.patch
+++ b/external/curl/curl-7.26.0_strlcat.patch
diff --git a/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch
index e3beb4004885..e3beb4004885 100644
--- a/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
diff --git a/curl/curl-7.26.0_win.patch b/external/curl/curl-7.26.0_win.patch
index 0b3eed2d2eb6..0b3eed2d2eb6 100644
--- a/curl/curl-7.26.0_win.patch
+++ b/external/curl/curl-7.26.0_win.patch
diff --git a/curl/curl-aix.patch b/external/curl/curl-aix.patch
index 708411ccf1ef..708411ccf1ef 100644
--- a/curl/curl-aix.patch
+++ b/external/curl/curl-aix.patch
diff --git a/curl/curl-android.patch b/external/curl/curl-android.patch
index 40cf12447dbb..40cf12447dbb 100644
--- a/curl/curl-android.patch
+++ b/external/curl/curl-android.patch