[aadk-commits] qwell: uClinux/trunk r81 - in
/uClinux/trunk/uClinux-dist/lib/libssl: ./ crypto/
aadk-commits at lists.digium.com
aadk-commits at lists.digium.com
Thu Dec 21 13:29:48 MST 2006
Author: qwell
Date: Thu Dec 21 14:29:47 2006
New Revision: 81
URL: http://svn.digium.com/view/aadk?view=rev&rev=81
Log:
shared library stuff for openssl
Modified:
uClinux/trunk/uClinux-dist/lib/libssl/Configure
uClinux/trunk/uClinux-dist/lib/libssl/Makefile
uClinux/trunk/uClinux-dist/lib/libssl/Makefile.org
uClinux/trunk/uClinux-dist/lib/libssl/crypto/opensslconf.h
Modified: uClinux/trunk/uClinux-dist/lib/libssl/Configure
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/lib/libssl/Configure?view=diff&rev=81&r1=80&r2=81
==============================================================================
--- uClinux/trunk/uClinux-dist/lib/libssl/Configure (original)
+++ uClinux/trunk/uClinux-dist/lib/libssl/Configure Thu Dec 21 14:29:47 2006
@@ -320,7 +320,7 @@
#### IA-32 targets...
"linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-bfin", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${bfin_gcc_des} ${bfin_gcc_opts}:${no_asm}:::::",
+"linux-bfin", "bfin-uclinux-gcc:\$(CFLAGS) -DL_ENDIAN -DTERMIO -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${bfin_gcc_des} ${bfin_gcc_opts}:${no_asm}:dlfcn:linux-shared::-mfdpic:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):bfin-uclinux-ranlib",
"linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
####
"linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
Modified: uClinux/trunk/uClinux-dist/lib/libssl/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/lib/libssl/Makefile?view=diff&rev=81&r1=80&r2=81
==============================================================================
--- uClinux/trunk/uClinux-dist/lib/libssl/Makefile (original)
+++ uClinux/trunk/uClinux-dist/lib/libssl/Makefile Thu Dec 21 14:29:47 2006
@@ -11,12 +11,11 @@
SHLIB_VERSION_HISTORY=
SHLIB_MAJOR=0
SHLIB_MINOR=9.8
-SHLIB_EXT=
+SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
PLATFORM=linux-bfin
-OPTIONS= no-camellia no-gmp no-krb5 no-mdc2 no-rc5 no-shared no-zlib no-zlib-dynamic
-OPTIONS += enable-threads
-CONFIGURE_ARGS=linux-bfin threads
-SHLIB_TARGET=
+OPTIONS=enable-threads enable-shared no-camellia no-gmp no-krb5 no-mdc2 no-rc5 no-zlib no-zlib-dynamic
+CONFIGURE_ARGS=linux-bfin threads shared
+SHLIB_TARGET=linux-shared
# HERE indicates where this Makefile lives. This can be used to indicate
# where sub-Makefiles are expected to be. Currently has very limited usage,
@@ -60,14 +59,14 @@
# equal 4.
# PKCS1_CHECK - pkcs1 tests.
-CC?= bfin-uclinux-gcc
-CFLAG= $(CFLAGS) -DOPENSSL_THREADS -D_REENTRANT -DL_ENDIAN -DTERMIO -fomit-frame-pointer -Wall
+CC= bfin-uclinux-gcc
+CFLAG= -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H $(CFLAGS) -DL_ENDIAN -DTERMIO -fomit-frame-pointer -Wall
DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5
PEX_LIBS=
-EX_LIBS=
+EX_LIBS= -ldl
EXE_EXT=
ARFLAGS=
-AR=bfin-uclinux-ar $(ARFLAGS) r
+AR= bfin-uclinux-ar $(ARFLAGS) r
RANLIB= bfin-uclinux-ranlib
PERL= perl
TAR= tar
@@ -107,7 +106,7 @@
ZLIB_INCLUDE=
LIBZLIB=
-DIRS= crypto ssl engines
+DIRS= crypto ssl engines
SHLIBDIRS= crypto ssl
# dirs in crypto to build
@@ -141,9 +140,9 @@
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
SHARED_SSL=libssl$(SHLIB_EXT)
-SHARED_LIBS=
-SHARED_LIBS_LINK_EXTS=
-SHARED_LDFLAGS=
+SHARED_LIBS=$(SHARED_CRYPTO) $(SHARED_SSL)
+SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so
+SHARED_LDFLAGS=-mfdpic
GENERAL= Makefile
BASENAME= openssl
@@ -347,7 +346,6 @@
libclean:
rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
-romfs:
clean: libclean
rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
@@ -359,6 +357,19 @@
@set -e; for i in $(ONEDIRS) ;\
do \
rm -fr $$i/*; \
+ done
+
+romfs:
+ [ -d $(ROMFSDIR)/lib ] || mkdir -p $(ROMFSDIR)/lib ; \
+ for SHARED_LIB in $(SHARED_LIBS); do \
+ LIB=`basename $${SHARED_LIB} $(SHLIB_EXT)`; \
+ $(ROMFSINST) $${SHARED_LIB} /lib/$${SHARED_LIB} ; \
+ ( \
+ cd $(ROMFSDIR)/lib; \
+ for i in $(SHARED_LIBS_LINK_EXTS); do \
+ ln -sf $${SHARED_LIB} $${LIB}$$i; \
+ done \
+ ) \
done
makefile.one: files
Modified: uClinux/trunk/uClinux-dist/lib/libssl/Makefile.org
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/lib/libssl/Makefile.org?view=diff&rev=81&r1=80&r2=81
==============================================================================
--- uClinux/trunk/uClinux-dist/lib/libssl/Makefile.org (original)
+++ uClinux/trunk/uClinux-dist/lib/libssl/Makefile.org Thu Dec 21 14:29:47 2006
@@ -64,12 +64,12 @@
EX_LIBS=
EXE_EXT=
ARFLAGS=
-AR=ar $(ARFLAGS) r
+AR= bfin-uclinux-ar $(ARFLAGS) r
RANLIB= ranlib
PERL= perl
TAR= tar
TARFLAGS= --no-recursion
-MAKEDEPPROG=makedepend
+MAKEDEPPROG= gcc
# We let the C compiler driver to take care of .s files. This is done in
# order to be excused from maintaining a separate set of architecture
@@ -104,7 +104,7 @@
ZLIB_INCLUDE=
LIBZLIB=
-DIRS= crypto ssl engines apps test tools
+DIRS= crypto ssl engines
SHLIBDIRS= crypto ssl
# dirs in crypto to build
@@ -355,6 +355,19 @@
@set -e; for i in $(ONEDIRS) ;\
do \
rm -fr $$i/*; \
+ done
+
+romfs:
+ [ -d $(ROMFSDIR)/lib ] || mkdir -p $(ROMFSDIR)/lib ; \
+ for SHARED_LIB in $(SHARED_LIBS); do \
+ LIB=`basename $${SHARED_LIB} $(SHLIB_EXT)`; \
+ $(ROMFSINST) $${SHARED_LIB} /lib/$${SHARED_LIB} ; \
+ ( \
+ cd $(ROMFSDIR)/lib; \
+ for i in $(SHARED_LIBS_LINK_EXTS); do \
+ ln -sf $${SHARED_LIB} $${LIB}$$i; \
+ done \
+ ) \
done
makefile.one: files
Modified: uClinux/trunk/uClinux-dist/lib/libssl/crypto/opensslconf.h
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/lib/libssl/crypto/opensslconf.h?view=diff&rev=81&r1=80&r2=81
==============================================================================
--- uClinux/trunk/uClinux-dist/lib/libssl/crypto/opensslconf.h (original)
+++ uClinux/trunk/uClinux-dist/lib/libssl/crypto/opensslconf.h Thu Dec 21 14:29:47 2006
@@ -24,8 +24,8 @@
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
-# define OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_STATIC_ENGINE
+# define OPENSSL_NO_STATIC_ENGINE
#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
More information about the aadk-commits
mailing list