From 745793eeea4bb0cc0f2ea302d8a8636b3800ee13 Mon Sep 17 00:00:00 2001
From: Lubos Dolezel <lubos@dolezel.info>
Date: Sat, 20 Feb 2016 00:46:18 +0100
Subject: [PATCH] Add expat and sqlite, Python 2.6 now also builds (but there
 are issues to resolve)

---
 .gitmodules                | 12 ++++++++++++
 cmake/InstallSymlink.cmake |  5 +++--
 etc/dylib.conf             |  5 +++++
 src/CMakeLists.txt         |  3 +++
 src/dyld/darling           |  2 +-
 src/external/expat         |  1 +
 src/external/python        |  1 +
 src/external/sqlite        |  1 +
 src/libinfo/rpc            |  1 +
 src/libinfo/rpcsvc         |  1 +
 10 files changed, 29 insertions(+), 3 deletions(-)
 create mode 160000 src/external/expat
 create mode 160000 src/external/python
 create mode 160000 src/external/sqlite
 create mode 120000 src/libinfo/rpc
 create mode 120000 src/libinfo/rpcsvc

diff --git a/.gitmodules b/.gitmodules
index 76874d4c4..fd3562a37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -104,3 +104,15 @@
 	path = src/external/zip
 	url = ../darling-zip.git
 	branch = darling
+[submodule "src/external/python"]
+	path = src/external/python
+	url = ../darling-python.git
+	branch = darling
+[submodule "src/external/expat"]
+	path = src/external/expat
+	url = ../darling-expat.git
+	branch = darling
+[submodule "src/external/sqlite"]
+	path = src/external/sqlite
+	url = ../darling-sqlite.git
+	branch = darling
diff --git a/cmake/InstallSymlink.cmake b/cmake/InstallSymlink.cmake
index bbc752197..04e872186 100644
--- a/cmake/InstallSymlink.cmake
+++ b/cmake/InstallSymlink.cmake
@@ -20,8 +20,9 @@ macro(InstallSymlink _filepath _sympath)
     if (BINARY_PACKAGING_MODE)
         execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink
                         ${_filepath}
-                        ${CMAKE_CURRENT_BINARY_DIR}/${_symname})
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_symname}
+                        ${CMAKE_CURRENT_BINARY_DIR}/symlinks/${_symname})
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/symlinks)
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/symlinks/${_symname}
                 DESTINATION ${_installdir})
     else ()
         # scripting the symlink installation at install time should work
diff --git a/etc/dylib.conf b/etc/dylib.conf
index 93e46faf3..4e7e2aa96 100644
--- a/etc/dylib.conf
+++ b/etc/dylib.conf
@@ -52,6 +52,11 @@
 /usr/lib/liblzma.5.dylib=liblzma.so
 /usr/lib/libpcre.dylib=libpcre.so
 /usr/lib/libpcre.0.dylib=libpcre.so
+/usr/lib/libexpat.dylib=libexpat.so
+/usr/lib/libexpat.1.dylib=libexpat.so
+/usr/lib/libexpat.1.5.2.dylib=libexpat.so
+/usr/lib/libsqlite3.dylib=libsqlite3.so
+/usr/lib/libsqlite3.0.dylib=libsqlite3.so
 
 [CoreFoundation.framework]
 A=libCFFExtra.so
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67ef8fdc1..2627edb58 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,6 +111,7 @@ add_subdirectory(external/curl)
 add_subdirectory(external/liblzma)
 add_subdirectory(external/cfnetwork)
 add_subdirectory(external/pcre)
+add_subdirectory(external/sqlite)
 add_subdirectory(CFF)
 add_subdirectory(CoreServices)
 add_subdirectory(ApplicationServices)
@@ -121,6 +122,8 @@ add_subdirectory(libedit)
 add_subdirectory(external/compiler-rt/lib/builtins)
 add_subdirectory(CommonCrypto)
 add_subdirectory(csu)
+add_subdirectory(external/python/2.6/Python-2.6.9)
+add_subdirectory(external/expat)
 
 if (NOT DARLING_NO_EXECUTABLES)
 	add_subdirectory(external/shell_cmds)
diff --git a/src/dyld/darling b/src/dyld/darling
index 098e444db..e64b69078 100755
--- a/src/dyld/darling
+++ b/src/dyld/darling
@@ -21,7 +21,7 @@
 SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
 DARLING_PREFIX=$(realpath "$SCRIPTPATH/..")
-MINIMUM_PREFIX_VERSION="1"
+MINIMUM_PREFIX_VERSION="2"
 
 setup_prefix() {
     prefix_pkg="/tmp/prefix.$$.pkg"
diff --git a/src/external/expat b/src/external/expat
new file mode 160000
index 000000000..1dc6eea39
--- /dev/null
+++ b/src/external/expat
@@ -0,0 +1 @@
+Subproject commit 1dc6eea394531f641ed10e5ea5c486bb5da62ecc
diff --git a/src/external/python b/src/external/python
new file mode 160000
index 000000000..42faa3f37
--- /dev/null
+++ b/src/external/python
@@ -0,0 +1 @@
+Subproject commit 42faa3f37f5a5bd247de7ccbe2fa3a6ff4b54157
diff --git a/src/external/sqlite b/src/external/sqlite
new file mode 160000
index 000000000..a8180347e
--- /dev/null
+++ b/src/external/sqlite
@@ -0,0 +1 @@
+Subproject commit a8180347e8b86b96961b67f68c3c12280c2ccdec
diff --git a/src/libinfo/rpc b/src/libinfo/rpc
new file mode 120000
index 000000000..a0d95709e
--- /dev/null
+++ b/src/libinfo/rpc
@@ -0,0 +1 @@
+rpc.subproj
\ No newline at end of file
diff --git a/src/libinfo/rpcsvc b/src/libinfo/rpcsvc
new file mode 120000
index 000000000..70e8b2360
--- /dev/null
+++ b/src/libinfo/rpcsvc
@@ -0,0 +1 @@
+nis.subproj/
\ No newline at end of file
-- 
2.51.2