From 0a0f0031a496342ff44bc702e9792f7956904d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= <josef.soentgen@genode-labs.com>
Date: Fri, 23 May 2014 12:12:21 +0200
Subject: [PATCH] libports: enable curl on arm

---
 repos/libports/lib/import/import-curl.mk                  | 8 ++++----
 repos/libports/lib/mk/32bit/curl.mk                       | 6 ++++++
 repos/libports/lib/mk/64bit/curl.mk                       | 6 ++++++
 repos/libports/lib/mk/{curl.mk => curl.inc}               | 0
 .../src/lib/curl/{x86_32 => 32bit}/curl/curlbuild.h       | 0
 .../src/lib/curl/{x86_64 => 64bit}/curl/curlbuild.h       | 0
 6 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 repos/libports/lib/mk/32bit/curl.mk
 create mode 100644 repos/libports/lib/mk/64bit/curl.mk
 rename repos/libports/lib/mk/{curl.mk => curl.inc} (100%)
 rename repos/libports/src/lib/curl/{x86_32 => 32bit}/curl/curlbuild.h (100%)
 rename repos/libports/src/lib/curl/{x86_64 => 64bit}/curl/curlbuild.h (100%)

diff --git a/repos/libports/lib/import/import-curl.mk b/repos/libports/lib/import/import-curl.mk
index fd65a929e..524b9e13e 100644
--- a/repos/libports/lib/import/import-curl.mk
+++ b/repos/libports/lib/import/import-curl.mk
@@ -1,9 +1,9 @@
 INC_DIR += $(call select_from_ports,curl)/include
 
-ifeq ($(filter-out $(SPECS),x86_32),)
-TARGET_CPUARCH=x86_32
-else ifeq ($(filter-out $(SPECS),x86_64),)
-TARGET_CPUARCH=x86_64
+ifeq ($(filter-out $(SPECS),32bit),)
+TARGET_CPUARCH=32bit
+else ifeq ($(filter-out $(SPECS),64bit),)
+TARGET_CPUARCH=64bit
 endif
 
 # include architecture specific curlbuild.h
diff --git a/repos/libports/lib/mk/32bit/curl.mk b/repos/libports/lib/mk/32bit/curl.mk
new file mode 100644
index 000000000..33a3f5d0a
--- /dev/null
+++ b/repos/libports/lib/mk/32bit/curl.mk
@@ -0,0 +1,6 @@
+INC_DIR += $(call select_from_ports,curl)/include
+
+INC_DIR += $(REP_DIR)/src/lib/curl/32bit
+INC_DIR += $(REP_DIR)/src/lib/curl/32bit/curl
+
+include $(REP_DIR)/lib/mk/curl.inc
diff --git a/repos/libports/lib/mk/64bit/curl.mk b/repos/libports/lib/mk/64bit/curl.mk
new file mode 100644
index 000000000..466a09abc
--- /dev/null
+++ b/repos/libports/lib/mk/64bit/curl.mk
@@ -0,0 +1,6 @@
+INC_DIR += $(call select_from_ports,curl)/include
+
+INC_DIR += $(REP_DIR)/src/lib/curl/64bit
+INC_DIR += $(REP_DIR)/src/lib/curl/64bit/curl
+
+include $(REP_DIR)/lib/mk/curl.inc
diff --git a/repos/libports/lib/mk/curl.mk b/repos/libports/lib/mk/curl.inc
similarity index 100%
rename from repos/libports/lib/mk/curl.mk
rename to repos/libports/lib/mk/curl.inc
diff --git a/repos/libports/src/lib/curl/x86_32/curl/curlbuild.h b/repos/libports/src/lib/curl/32bit/curl/curlbuild.h
similarity index 100%
rename from repos/libports/src/lib/curl/x86_32/curl/curlbuild.h
rename to repos/libports/src/lib/curl/32bit/curl/curlbuild.h
diff --git a/repos/libports/src/lib/curl/x86_64/curl/curlbuild.h b/repos/libports/src/lib/curl/64bit/curl/curlbuild.h
similarity index 100%
rename from repos/libports/src/lib/curl/x86_64/curl/curlbuild.h
rename to repos/libports/src/lib/curl/64bit/curl/curlbuild.h