diff options
| -rw-r--r-- | testing/libtls-standalone/APKBUILD | 4 | ||||
| -rw-r--r-- | testing/libtls-standalone/Makefile | 35 |
2 files changed, 20 insertions, 19 deletions
diff --git a/testing/libtls-standalone/APKBUILD b/testing/libtls-standalone/APKBUILD index 8c903a1502..ea80990b44 100644 --- a/testing/libtls-standalone/APKBUILD +++ b/testing/libtls-standalone/APKBUILD @@ -2,7 +2,7 @@ pkgname=libtls-standalone pkgver=2.7.4 _namever=${pkgname}${pkgver%.*} -pkgrel=3 +pkgrel=4 pkgdesc="libtls extricated from libressl sources" url="http://www.libressl.org/" arch="all" @@ -55,7 +55,7 @@ package() { } sha512sums="1cd82a1bff4f655251b5feb0c850f4164e0fd548e4b404407370f74dcc75c205f42efc7787a157eecac84cbbe46af48cb63f46b3fef75f4a0a9ea19a5863a691 libressl-2.7.4.tar.gz -b551cf31dd7d1d2d8be427c0a4410f031e66da7f39b27399135f7e6ad8d8e382c91d0adc32da3709b94ee23763e4ca5d5d46616d428919089824401b16f7ea55 Makefile +75292dcd0321a3cb00b30715f537cd35f2375922aac3ad5445f3d7b9eff16ab934926b1605f3330032f8455378c89f41bd1ed83f5a027fc967adff7006ed9486 Makefile be8216d08a6992ca65a8e3f1e010645833899465090179f269a62de5fcfe2711d463fe1aa57e408492648878fa2ee53377c4509ef48a2aafe3f267cce73e9209 tls_compat.c 0b8fca899e1f7b51979d69458be23c77c1b7f265ed60de76cf5cfb9eb5742111cf50813bd35384831301523a6a0562a20acf1aec22dc0d9ad653271d45ede915 tls_compat.h 71d36fe25c95a0a45497e3f699b01dddcaae9053dd1b1e2419df94272c47024cf6516c51c902129201061601b04a72551904b15a332a4cf53358983b5db73618 test_program.c diff --git a/testing/libtls-standalone/Makefile b/testing/libtls-standalone/Makefile index 64c794aa2a..781a15a7d1 100644 --- a/testing/libtls-standalone/Makefile +++ b/testing/libtls-standalone/Makefile @@ -4,15 +4,15 @@ LIBDIR = ${PREFIX}/lib INCLUDEDIR = ${PREFIX}/include LIBRESSL_VERSION = 1.0 -LIBTLS_SOVERSION = 1.1 -LIBTLS_FULLVERSION = 1.1.0 +LIBTLS_SOVERSION = 1 +LIBTLS_FULLVERSION = 1.0.0 OPENSSL_CFLAGS = $(shell pkgconf openssl --cflags) OPENSSL_LIBS = $(shell pkgconf openssl --libs) CFLAGS = -Wall -Wno-pointer-sign -fPIC -DPIC -shared -include tls_compat.h -isystem ${LIBRESSL_SRCDIR}/include/compat ${OPENSSL_CFLAGS} -I ${LIBRESSL_SRCDIR}/include \ -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -LDFLAGS = -fPIC -DPIC -shared -Wl,-soname,libtls.so.${LIBTLS_SOVERSION} ${OPENSSL_LIBS} +LDFLAGS = -fPIC -DPIC -shared -Wl,-soname,libtls-standalone.so.${LIBTLS_SOVERSION} ${OPENSSL_LIBS} SOURCES = \ tls_compat.c \ @@ -35,7 +35,7 @@ SOURCES = \ OBJECTS = ${SOURCES:.c=.o} -all: dumpconfig libtls.so.${LIBTLS_FULLVERSION} libtls.so.${LIBTLS_SOVERSION} libtls.pc +all: dumpconfig libtls-standalone.so.${LIBTLS_FULLVERSION} libtls-standalone.so.${LIBTLS_SOVERSION} libtls-standalone.pc dumpconfig: @echo "Building with:" @@ -46,40 +46,41 @@ dumpconfig: .c.o: ${CC} ${CFLAGS} -o $@ -c $< -libtls.so.${LIBTLS_SOVERSION}: libtls.so.${LIBTLS_FULLVERSION} +libtls-standalone.so.${LIBTLS_SOVERSION}: libtls-standalone.so.${LIBTLS_FULLVERSION} ln -s $< $@ -libtls.so.${LIBTLS_FULLVERSION}: ${OBJECTS} +libtls-standalone.so.${LIBTLS_FULLVERSION}: ${OBJECTS} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${OPENSSL_LIBS} check: test_program LD_LIBRARY_PATH=$$PWD ./test_program test_program: test_program.c - ${CC} -I${LIBRESSL_SRCDIR}/include -o $@ test_program.c ./libtls.so.${LIBTLS_FULLVERSION} + ${CC} -I${LIBRESSL_SRCDIR}/include -o $@ test_program.c ./libtls-standalone.so.${LIBTLS_FULLVERSION} clean: rm -f ${OBJECTS} - rm -f libtls.so.${LIBTLS_FULLVERSION} libtls.so.${LIBTLS_SOVERSION} + rm -f libtls-standalone.so.${LIBTLS_FULLVERSION} libtls-standalone.so.${LIBTLS_SOVERSION} rm -f test_program install: - install -D -m755 libtls.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls.so.${LIBTLS_FULLVERSION} - ln -sf libtls.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls.so.${LIBTLS_SOVERSION} - ln -sf libtls.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls.so + install -D -m755 libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so.${LIBTLS_FULLVERSION} + ln -sf libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so.${LIBTLS_SOVERSION} + ln -sf libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so - install -D -m644 ${LIBRESSL_SRCDIR}/include/tls.h ${DESTDIR}${PREFIX}/include/tls.h + install -D -m644 ${LIBRESSL_SRCDIR}/include/tls.h ${DESTDIR}${PREFIX}/include/libtls-standalone/tls.h - install -D -m644 libtls.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/libtls.pc + install -D -m644 libtls-standalone.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/libtls-standalone.pc -libtls.pc: ${LIBRESSL_SRCDIR}/libtls.pc.in +libtls-standalone.pc: ${LIBRESSL_SRCDIR}/libtls.pc.in sed -e s:@prefix@:${PREFIX}:g \ -e s:@exec_prefix@:${EXEC_PREFIX}:g \ -e s:@libdir@:${LIBDIR}:g \ - -e s:@includedir@:${INCLUDEDIR}:g \ - -e s:@LIBS@:-ltls:g \ + -e s:@includedir@:${INCLUDEDIR}/libtls-standalone:g \ + -e s:@LIBS@:-ltls-standalone:g \ -e s:@PLATFORM_LDADD@::g \ -e s:@VERSION@:${LIBRESSL_VERSION}:g \ - ${LIBRESSL_SRCDIR}/libtls.pc.in > libtls.pc + -e /^Libs:/s:-ltls:-ltls-standalone:g \ + $< > libtls-standalone.pc .DUMMY: check dumpconfig clean install |