patch-Makefile 4.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596
  1. --- openssl-1.0.1i.orig/Makefile 2014-08-06 23:18:45.000000000 +0200
  2. +++ openssl-1.0.1i/Makefile 2014-08-07 10:03:55.000000000 +0200
  3. @@ -11,11 +11,11 @@ SHLIB_VERSION_NUMBER=1.0.0
  4. SHLIB_VERSION_HISTORY=
  5. SHLIB_MAJOR=1
  6. SHLIB_MINOR=0.0
  7. -SHLIB_EXT=
  8. -PLATFORM=dist
  9. -OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-unit-test no-zlib no-zlib-dynamic static-engine
  10. -CONFIGURE_ARGS=dist
  11. -SHLIB_TARGET=
  12. +SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
  13. +PLATFORM=linux-embedded
  14. +OPTIONS=--prefix=/usr --openssldir=/etc/ssl -I/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/include -L/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/lib -DOPENSSL_SMALL_FOOTPRINT enable-shared enable-threads enable-zlib-dynamic no-aes192 no-camellia no-cast no-ec_nistp_64_gcc_128 no-engines no-err no-gmp no-idea no-jpake no-krb5 no-md2 no-mdc2 no-rc5 no-rfc3779 no-ripemd no-sctp no-sha0 no-smime no-store no-unit-test no-static-engine
  15. +CONFIGURE_ARGS=linux-embedded --prefix=/usr --openssldir=/etc/ssl -I/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/include -L/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/lib -DOPENSSL_SMALL_FOOTPRINT shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
  16. +SHLIB_TARGET=linux-shared
  17. # HERE indicates where this Makefile lives. This can be used to indicate
  18. # where sub-Makefiles are expected to be. Currently has very limited usage,
  19. @@ -26,10 +26,10 @@ HERE=.
  20. # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
  21. # Normally it is left empty.
  22. INSTALL_PREFIX=
  23. -INSTALLTOP=/usr/local/ssl
  24. +INSTALLTOP=/usr
  25. # Do not edit this manually. Use Configure --openssldir=DIR do change this!
  26. -OPENSSLDIR=/usr/local/ssl
  27. +OPENSSLDIR=/etc/ssl
  28. # NO_IDEA - Define to build without the IDEA algorithm
  29. # NO_RC4 - Define to build without the RC4 algorithm
  30. @@ -59,16 +59,17 @@ OPENSSLDIR=/usr/local/ssl
  31. # equal 4.
  32. # PKCS1_CHECK - pkcs1 tests.
  33. -CC= cc
  34. -CFLAG= -O
  35. -DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST
  36. +CROSS_COMPILE= /home/wbx/adk/toolchain_qemu-x86_uclibc-ng_i686/usr/bin/i686-openadk-linux-uclibc-
  37. +CC= $(CROSS_COMPILE)/home/wbx/adk/toolchain_qemu-x86_uclibc-ng_i686/usr/bin/i686-openadk-linux-uclibc-gcc
  38. +CFLAG= -fPIC -DOPENSSL_PIC -DZLIB_SHARED -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -I/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/include -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_ERR -DTERMIOS $(OPTIMIZATION_FLAGS) -Wall
  39. +DEPFLAG= -DOPENSSL_NO_AES192 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAST -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_ENGINES -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_RIPEMD -DOPENSSL_NO_SCTP -DOPENSSL_NO_SHA0 -DOPENSSL_NO_SMIME -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST
  40. PEX_LIBS=
  41. -EX_LIBS=
  42. +EX_LIBS= -L/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/lib -ldl
  43. EXE_EXT=
  44. ARFLAGS=
  45. -AR= ar $(ARFLAGS) r
  46. -RANLIB= /usr/bin/ranlib
  47. -NM= nm
  48. +AR= $(CROSS_COMPILE)ar $(ARFLAGS) r
  49. +RANLIB= $(CROSS_COMPILE)ranlib
  50. +NM= $(CROSS_COMPILE)nm
  51. PERL= /usr/bin/perl
  52. TAR= tar
  53. TARFLAGS= --no-recursion --record-size=10240
  54. @@ -103,7 +104,7 @@ WP_ASM_OBJ= wp_block.o
  55. CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
  56. MODES_ASM_OBJ=
  57. ENGINES_ASM_OBJ=
  58. -PERLASM_SCHEME=
  59. +PERLASM_SCHEME= void
  60. # KRB5 stuff
  61. KRB5_INCLUDES=
  62. @@ -137,15 +138,15 @@ FIPSCANLIB=
  63. BASEADDR=0xFB00000
  64. -DIRS= crypto ssl engines apps test tools
  65. +DIRS= crypto ssl engines apps tools
  66. ENGDIRS= ccgost
  67. SHLIBDIRS= crypto ssl
  68. # dirs in crypto to build
  69. SDIRS= \
  70. objects \
  71. - md4 md5 sha mdc2 hmac ripemd whrlpool \
  72. - des aes rc2 rc4 idea bf cast camellia seed modes \
  73. + md4 md5 sha hmac whrlpool \
  74. + des aes rc2 rc4 bf seed modes \
  75. bn ec rsa dsa ecdsa dh ecdh dso engine \
  76. buffer bio stack lhash rand err \
  77. evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
  78. @@ -174,8 +175,8 @@ WDIRS= windows
  79. LIBS= libcrypto.a libssl.a
  80. SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  81. SHARED_SSL=libssl$(SHLIB_EXT)
  82. -SHARED_LIBS=
  83. -SHARED_LIBS_LINK_EXTS=
  84. +SHARED_LIBS=$(SHARED_CRYPTO) $(SHARED_SSL)
  85. +SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
  86. SHARED_LDFLAGS=
  87. GENERAL= Makefile