diff options
author | Brent Cook <busterb@gmail.com> | 2022-12-13 05:44:07 -0600 |
---|---|---|
committer | Brent Cook <busterb@gmail.com> | 2022-12-14 06:28:11 -0600 |
commit | 80eb1454604f71fdcbb17c7fb73bade22031ef81 (patch) | |
tree | ea2803f5c5f8dec013817473e1bc75ed8a0ccd0a | |
parent | 4f0f6ebd1aa1038923e08af6730a32cde3202f62 (diff) | |
download | portable-80eb1454604f71fdcbb17c7fb73bade22031ef81.tar.gz portable-80eb1454604f71fdcbb17c7fb73bade22031ef81.tar.bz2 portable-80eb1454604f71fdcbb17c7fb73bade22031ef81.zip |
add direct source dependency to each library
Fix library generation with some CMake generators by including a direct
source file dependency for each library.
-rw-r--r-- | crypto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | crypto/Makefile.am | 1 | ||||
-rw-r--r-- | ssl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ssl/Makefile.am | 1 | ||||
-rw-r--r-- | tls/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tls/Makefile.am | 1 | ||||
-rwxr-xr-x | update.sh | 3 |
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 | ||
1012 | add_library(crypto $<TARGET_OBJECTS:crypto_obj>) | 1012 | add_library(crypto $<TARGET_OBJECTS:crypto_obj> empty.c) |
1013 | 1013 | ||
1014 | export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) | 1014 | export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) |
1015 | target_link_libraries(crypto ${PLATFORM_LIBS}) | 1015 | target_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 | |||
32 | EXTRA_DIST = VERSION | 32 | EXTRA_DIST = VERSION |
33 | EXTRA_DIST += CMakeLists.txt | 33 | EXTRA_DIST += CMakeLists.txt |
34 | EXTRA_DIST += crypto.sym | 34 | EXTRA_DIST += crypto.sym |
35 | EXTRA_DIST += empty.c | ||
35 | 36 | ||
36 | # needed for a CMake target | 37 | # needed for a CMake target |
37 | EXTRA_DIST += compat/strcasecmp.c | 38 | EXTRA_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 | |||
79 | if(BUILD_SHARED_LIBS) | 79 | if(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>) |
81 | else() | 81 | else() |
82 | add_library(ssl $<TARGET_OBJECTS:ssl_obj>) | 82 | add_library(ssl $<TARGET_OBJECTS:ssl_obj> empty.c) |
83 | endif() | 83 | endif() |
84 | 84 | ||
85 | export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) | 85 | export_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 | |||
15 | EXTRA_DIST = VERSION | 15 | EXTRA_DIST = VERSION |
16 | EXTRA_DIST += CMakeLists.txt | 16 | EXTRA_DIST += CMakeLists.txt |
17 | EXTRA_DIST += ssl.sym | 17 | EXTRA_DIST += ssl.sym |
18 | EXTRA_DIST += empty.c | ||
18 | 19 | ||
19 | CLEANFILES = libssl_la_objects.mk | 20 | CLEANFILES = 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 | ||
50 | add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj> | 50 | add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj> |
51 | $<TARGET_OBJECTS:crypto_obj>) | 51 | $<TARGET_OBJECTS:crypto_obj> empty.c) |
52 | 52 | ||
53 | export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym) | 53 | export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym) |
54 | target_link_libraries(tls ${PLATFORM_LIBS}) | 54 | target_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 | |||
8 | EXTRA_DIST = VERSION | 8 | EXTRA_DIST = VERSION |
9 | EXTRA_DIST += CMakeLists.txt | 9 | EXTRA_DIST += CMakeLists.txt |
10 | EXTRA_DIST += tls.sym | 10 | EXTRA_DIST += tls.sym |
11 | EXTRA_DIST += empty.c | ||
11 | 12 | ||
12 | CLEANFILES = libtls_la_objects.mk | 13 | CLEANFILES = libtls_la_objects.mk |
13 | 14 | ||
@@ -141,6 +141,7 @@ echo "LibreSSL version `cat VERSION`" | |||
141 | # copy libcrypto source | 141 | # copy libcrypto source |
142 | echo copying libcrypto source | 142 | echo copying libcrypto source |
143 | rm -f crypto/*.c crypto/*.h | 143 | rm -f crypto/*.c crypto/*.h |
144 | touch crypto/empty.c | ||
144 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do | 145 | for 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 |
232 | echo copying libtls source | 233 | echo copying libtls source |
233 | rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h | 234 | rm -f tls/*.c tls/*.h libtls/src/*.c libtls/src/*.h |
235 | touch tls/empty.c | ||
234 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do | 236 | for 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 |
277 | echo "copying libssl source" | 279 | echo "copying libssl source" |
278 | rm -f ssl/*.c ssl/*.h | 280 | rm -f ssl/*.c ssl/*.h |
281 | touch ssl/empty.c | ||
279 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do | 282 | for 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 |