mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-03 12:11:27 -05:00 
			
		
		
		
	Revert "Replace SONAME with SOVERSION in makefile"
This reverts commit 418080010a1dcc1cdcb192e603a8c3b9656dcb1a. In preparation of merging one external contribution that supersedes this.
This commit is contained in:
		
							parent
							
								
									99b9259f76
								
							
						
					
					
						commit
						f812054d00
					
				@ -25,9 +25,9 @@ CFLAGS += -fPIC
 | 
			
		||||
endif
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
SOVERSION=8
 | 
			
		||||
SONAME=libmbedtls.so.7
 | 
			
		||||
 | 
			
		||||
DLEXT=so.$(SOVERSION)
 | 
			
		||||
DLEXT=so.8
 | 
			
		||||
# OSX shared library extension:
 | 
			
		||||
# DLEXT=dylib
 | 
			
		||||
 | 
			
		||||
@ -92,14 +92,14 @@ libpolarssl.so: libmbedtls.so
 | 
			
		||||
	echo "  LN    $@ -> $?"
 | 
			
		||||
	ln -sf $? $@
 | 
			
		||||
 | 
			
		||||
libmbedtls.${DLEXT}: $(OBJS)
 | 
			
		||||
	echo "  LD    $@"
 | 
			
		||||
	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
 | 
			
		||||
 | 
			
		||||
libmbedtls.so: libmbedtls.${DLEXT}
 | 
			
		||||
	echo "  LN    $@ -> libmbedtls.${DLEXT}"
 | 
			
		||||
	ln -sf libmbedtls.${DLEXT} $@
 | 
			
		||||
 | 
			
		||||
libmbedtls.so.$(SOVERSION): $(OBJS)
 | 
			
		||||
	echo "  LD    $@"
 | 
			
		||||
	$(CC) ${LDFLAGS} -shared -Wl,-soname,$@ -o $@ $(OBJS)
 | 
			
		||||
 | 
			
		||||
libmbedtls.dylib: $(OBJS)
 | 
			
		||||
	echo "  LD    $@"
 | 
			
		||||
	$(CC) ${LDFLAGS} -dynamiclib -o $@ $(OBJS)
 | 
			
		||||
 | 
			
		||||
@ -56,7 +56,7 @@ then
 | 
			
		||||
  mv tmp library/CMakeLists.txt
 | 
			
		||||
 | 
			
		||||
  [ $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
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user