Commits

Ivan Vučica  committed 310c0f0

Disabled sysinfo patch (NDK now includes a conflicting definition of sysinfo()). Added -integrated-as to gnustep-make.

This seems to complete the fix of the build process.

  • Participants
  • Parent commits cc5254b

Comments (0)

Files changed (2)

File phases/36-build-gnustep-make.sh

 cd "${ANDROID_GNUSTEP_INSTALL_ROOT}"
 cd gnustep/core/make
 
-./configure --host=arm-linux-androideabi --prefix=${ANDROID_GNUSTEP_INSTALL_ROOT}/gs-install
+./configure --host=arm-linux-androideabi --prefix=${ANDROID_GNUSTEP_INSTALL_ROOT}/gs-install  OBJCFLAGS="${OBJCFLAGS} -integrated-as"
 make
 make install
 

File phases/45-patch-gnustep-base.sh

 cd "${ANDROID_GNUSTEP_INSTALL_ROOT}"
 cd gnustep/core/base
 
+echo " -> Currently in $(pwd)"
 #patch -p1 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/00-emmanuel-gsbase_configure_ac.patch
-#patch -p1 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/01-ivucica-gsbase-timezone-daylight.patch
-#patch -p1 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/02-ivucica-gsbase-objc-load-force_dladdr_branch.patch
-patch -p1 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/03-ivucica-gsbase-disabling_openssl.patch
-patch -p1 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/04-ivucica-gsbase-sysinfo_syscall.patch
+#patch -p0 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/01-ivucica-gsbase-timezone-daylight.patch
+#patch -p0 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/02-ivucica-gsbase-objc-load-force_dladdr_branch.patch
+echo " -> Applying patch 03"
+patch -p0 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/03-ivucica-gsbase-disabling_openssl.patch
+#echo " -> Applying patch 04"
+#patch -p0 < ${ANDROID_GNUSTEP_SCRIPT_ROOT}/patches/04-ivucica-gsbase-sysinfo_syscall.patch
 
+echo " -> Updating cross.config"
 # tell gnustep-base that we DO have an objc2 runtime
 svn revert cross.config
 echo "cross_objc2_runtime=1" >> cross.config