aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crypto/CMakeLists.txt2
-rw-r--r--crypto/Makefile.am1
-rw-r--r--ssl/CMakeLists.txt2
-rw-r--r--ssl/Makefile.am1
-rw-r--r--tls/CMakeLists.txt2
-rw-r--r--tls/Makefile.am1
-rwxr-xr-xupdate.sh3
7 files changed, 9 insertions, 3 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 8956884..bb43432 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1009,7 +1009,7 @@ target_include_directories(crypto_obj
1009 PUBLIC 1009 PUBLIC
1010 ../include) 1010 ../include)
1011 1011
1012add_library(crypto $<TARGET_OBJECTS:crypto_obj>) 1012add_library(crypto $<TARGET_OBJECTS:crypto_obj> empty.c)
1013 1013
1014export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) 1014export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
1015target_link_libraries(crypto ${PLATFORM_LIBS}) 1015target_link_libraries(crypto ${PLATFORM_LIBS})
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index bc3d4c2..e380fdf 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -32,6 +32,7 @@ endif
32EXTRA_DIST = VERSION 32EXTRA_DIST = VERSION
33EXTRA_DIST += CMakeLists.txt 33EXTRA_DIST += CMakeLists.txt
34EXTRA_DIST += crypto.sym 34EXTRA_DIST += crypto.sym
35EXTRA_DIST += empty.c
35 36
36# needed for a CMake target 37# needed for a CMake target
37EXTRA_DIST += compat/strcasecmp.c 38EXTRA_DIST += compat/strcasecmp.c
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 4c7357a..173c3b5 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -79,7 +79,7 @@ target_include_directories(bs_obj
79if(BUILD_SHARED_LIBS) 79if(BUILD_SHARED_LIBS)
80 add_library(ssl $<TARGET_OBJECTS:ssl_obj> $<TARGET_OBJECTS:bs_obj>) 80 add_library(ssl $<TARGET_OBJECTS:ssl_obj> $<TARGET_OBJECTS:bs_obj>)
81else() 81else()
82 add_library(ssl $<TARGET_OBJECTS:ssl_obj>) 82 add_library(ssl $<TARGET_OBJECTS:ssl_obj> empty.c)
83endif() 83endif()
84 84
85export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) 85export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index 6591ffa..a2155fb 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -15,6 +15,7 @@ noinst_DATA = remove_bs_objects
15EXTRA_DIST = VERSION 15EXTRA_DIST = VERSION
16EXTRA_DIST += CMakeLists.txt 16EXTRA_DIST += CMakeLists.txt
17EXTRA_DIST += ssl.sym 17EXTRA_DIST += ssl.sym
18EXTRA_DIST += empty.c
18 19
19CLEANFILES = libssl_la_objects.mk 20CLEANFILES = libssl_la_objects.mk
20 21
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 7827a5e..62dde63 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -48,7 +48,7 @@ target_include_directories(tls_obj
48 ../include) 48 ../include)
49 49
50add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj> 50add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj>
51 $<TARGET_OBJECTS:crypto_obj>) 51 $<TARGET_OBJECTS:crypto_obj> empty.c)
52 52
53export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym) 53export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym)
54target_link_libraries(tls ${PLATFORM_LIBS}) 54target_link_libraries(tls ${PLATFORM_LIBS})
diff --git a/tls/Makefile.am b/tls/Makefile.am
index 160359c..9b62b22 100644
--- a/tls/Makefile.am
+++ b/tls/Makefile.am
@@ -8,6 +8,7 @@ lib_LTLIBRARIES = libtls.la
8EXTRA_DIST = VERSION 8EXTRA_DIST = VERSION
9EXTRA_DIST += CMakeLists.txt 9EXTRA_DIST += CMakeLists.txt
10EXTRA_DIST += tls.sym 10EXTRA_DIST += tls.sym
11EXTRA_DIST += empty.c
11 12
12CLEANFILES = libtls_la_objects.mk 13CLEANFILES = libtls_la_objects.mk
13 14
diff --git a/update.sh b/update.sh
index c7ff9fb..1feca33 100755
--- a/update.sh
+++ b/update.sh
@@ -141,6 +141,7 @@ echo "LibreSSL version `cat VERSION`"
141# copy libcrypto source 141# copy libcrypto source
142echo copying libcrypto source 142echo copying libcrypto source
143rm -f crypto/*.c crypto/*.h 143rm -f crypto/*.c crypto/*.h
144touch crypto/empty.c
144for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do 145for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do
145 dir=`dirname $i` 146 dir=`dirname $i`
146 mkdir -p crypto/$dir 147 mkdir -p crypto/$dir
@@ -231,6 +232,7 @@ done
231# copy libtls source 232# copy libtls source
232echo copying libtls source 233echo copying libtls source
233rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h 234rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h
235touch tls/empty.c
234for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do 236for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
235 if [ -e $libtls_src/$i ]; then 237 if [ -e $libtls_src/$i ]; then
236 $CP $libtls_src/$i tls 238 $CP $libtls_src/$i tls
@@ -276,6 +278,7 @@ done
276# copy libssl source 278# copy libssl source
277echo "copying libssl source" 279echo "copying libssl source"
278rm -f ssl/*.c ssl/*.h 280rm -f ssl/*.c ssl/*.h
281touch ssl/empty.c
279for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do 282for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
280 dir=`dirname $i` 283 dir=`dirname $i`
281 mkdir -p ssl/$dir 284 mkdir -p ssl/$dir