Merge pull request #1182 from martin-frbg/martin-frbg-patch-1
Build shared library on Android without SONAME versioning
This commit is contained in:
commit
42466e54fa
|
@ -122,6 +122,12 @@ ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android))
|
||||||
|
|
||||||
so : ../$(LIBSONAME)
|
so : ../$(LIBSONAME)
|
||||||
|
|
||||||
|
ifeq ($(OSNAME), Android)
|
||||||
|
INTERNALNAME = $(LIBPREFIX).so
|
||||||
|
else
|
||||||
|
INTERNALNAME = $(LIBPREFIX).so.$(MAJOR_VERSION)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
|
ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
|
||||||
../$(LIBSONAME) : ../$(LIBNAME) linktest.c
|
../$(LIBSONAME) : ../$(LIBNAME) linktest.c
|
||||||
else
|
else
|
||||||
|
@ -132,13 +138,13 @@ endif
|
||||||
ifneq ($(C_COMPILER), LSB)
|
ifneq ($(C_COMPILER), LSB)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,--whole-archive $< -Wl,--no-whole-archive \
|
-Wl,--whole-archive $< -Wl,--no-whole-archive \
|
||||||
-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
|
-Wl,-soname,$(INTERNALNAME) $(EXTRALIB)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
else
|
else
|
||||||
#for LSB
|
#for LSB
|
||||||
env LSBCC_SHAREDLIBS=gfortran $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
env LSBCC_SHAREDLIBS=gfortran $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,--whole-archive $< -Wl,--no-whole-archive \
|
-Wl,--whole-archive $< -Wl,--no-whole-archive \
|
||||||
-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
|
-Wl,-soname,$(INTERNALNAME) $(EXTRALIB)
|
||||||
$(FC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
$(FC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
endif
|
endif
|
||||||
rm -f linktest
|
rm -f linktest
|
||||||
|
|
Loading…
Reference in New Issue