Commits

Ivan Vučica committed 5d67c3c

Updated OpenSSL disabling patch

Comments (0)

Files changed (1)

patches/03-ivucica-gsbase-disabling_openssl.patch

 ===================================================================
 --- GNUmakefile	(revision 37522)
 +++ GNUmakefile	(working copy)
-@@ -66,10 +66,12 @@
+@@ -66,12 +66,17 @@
  #
  SUBPROJECTS = Source
  ifeq ($(GNUSTEP_BASE_HAVE_GNUTLS), 0)
    SUBPROJECTS += SSL
  endif
  endif
+-SUBPROJECTS += Tools NSTimeZones Resources Tests
 +endif
- SUBPROJECTS += Tools NSTimeZones Resources Tests
  
++ifneq ($(GNUSTEP_TARGET_OS), linux-androideabi)
++  SUBPROJECTS += Tools NSTimeZones Resources Tests
++endif
++
  -include Makefile.preamble
+ 
+ include $(GNUSTEP_MAKEFILES)/aggregate.make
+Index: config.mak.in
+===================================================================
+--- config.mak.in	(revision 37522)
++++ config.mak.in	(working copy)
+@@ -42,6 +42,8 @@
+ GNUSTEP_BASE_HAVE_ICU=@HAVE_ICU@
+ GNUSTEP_BASE_HAVE_LIBDISPATCH=@HAVE_LIBDISPATCH@
+ 
++GNUSTEP_BASE_ENABLE_OPENSSL=@ENABLE_OPENSSL@
++
+ # Futureproofing ... if we ever use non-ascii string constants in base,
+ # we need to make sure that anyone building base uses the expected input
+ # characterset