cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Replace SONAME with SOVERSION in makefile"

Browse Source 
This reverts commit 418080010a1dcc1cdcb192e603a8c3b9656dcb1a.

In preparation of merging one external contribution that supersedes this.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-02-16 15:24:17 +00:00
parent 99b9259f76
commit f812054d00
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Makefile
View File

@ -25,9 +25,9 @@ CFLAGS += -fPIC
endif endif
endif endif
SOVERSION=8 SONAME=libmbedtls.so.7
DLEXT=so.$(SOVERSION) DLEXT=so.8
# OSX shared library extension: # OSX shared library extension:
# DLEXT=dylib # DLEXT=dylib
@ -92,14 +92,14 @@ libpolarssl.so: libmbedtls.so
echo " LN $@ -> $?" echo " LN $@ -> $?"
ln -sf $? $@ ln -sf $? $@
libmbedtls.${DLEXT}: $(OBJS)
echo " LD $@"
$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
libmbedtls.so: libmbedtls.${DLEXT} libmbedtls.so: libmbedtls.${DLEXT}
echo " LN $@ -> libmbedtls.${DLEXT}" echo " LN $@ -> libmbedtls.${DLEXT}"
ln -sf libmbedtls.${DLEXT} $@ ln -sf libmbedtls.${DLEXT} $@
libmbedtls.so.$(SOVERSION): $(OBJS)
echo " LD $@"
$(CC) ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ $(OBJS)
libmbedtls.dylib: $(OBJS) libmbedtls.dylib: $(OBJS)
echo " LD $@" echo " LD $@"
$(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS) $(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS)

2
scripts/bump_version.sh
View File

@ -56,7 +56,7 @@ then
mv tmp library/CMakeLists.txt mv tmp library/CMakeLists.txt
[ $VERBOSE ] && echo "Bumping SOVERSION in library/Makefile" [ $VERBOSE ] && echo "Bumping SOVERSION in library/Makefile"
sed -e "s/SOVERSION=[0-9]\+/SOVERSION=$SOVERSION/g" < library/Makefile > tmp sed -e "s/SONAME=libpolarssl.so.[0-9]\+/SONAME=libpolarssl.so.$SOVERSION/g" -e "s/DLEXT=so.[0-9]\+/DLEXT=so.$SOVERSION/g" < library/Makefile > tmp
mv tmp library/Makefile mv tmp library/Makefile
fi fi