Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 05:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing recent soname changes for OS X.

Browse source
This commit is contained in:
Alex Shinn 2014-04-18 22:56:06 +09:00
parent d33744b17d
commit 9fd0d6ac7a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -3,8 +3,7 @@
.PHONY: dist mips-dist cleaner test test-all test-dist checkdefs .PHONY: dist mips-dist cleaner test test-all test-dist checkdefs
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
VERSION ?= $(shell cat VERSION) SOVERSION ?= $(shell cat VERSION)
SOVERSION ?= $(shell echo "$(VERSION)" | sed "s/^\(\(\.\?[0-9]\+\)*\).*$$/\1/")
SOVERSION_MAJOR ?= $(shell echo "$(SOVERSION)" | sed "s/\..*//") SOVERSION_MAJOR ?= $(shell echo "$(SOVERSION)" | sed "s/\..*//")
CHIBI_FFI ?= $(CHIBI) -q tools/chibi-ffi CHIBI_FFI ?= $(CHIBI) -q tools/chibi-ffi
@ -101,7 +100,7 @@ libchibi-sexp$(SO): $(SEXP_OBJS)
$(CC) $(CLIBFLAGS) $(CLINKFLAGS) -o $@ $^ $(XLDFLAGS) $(CC) $(CLIBFLAGS) $(CLINKFLAGS) -o $@ $^ $(XLDFLAGS)
libchibi-scheme$(SO).$(SOVERSION): $(SEXP_OBJS) $(EVAL_OBJS) libchibi-scheme$(SO).$(SOVERSION): $(SEXP_OBJS) $(EVAL_OBJS)
$(CC) $(CLIBFLAGS) $(CLINKFLAGS) -Wl,-soname,libchibi-scheme$(SO).$(SOVERSION_MAJOR) -o $@ $^ $(XLDFLAGS) $(CC) $(CLIBFLAGS) $(CLINKFLAGS) $(LIBCHIBI_FLAGS) -o $@ $^ $(XLDFLAGS)
libchibi-scheme$(SO).$(SOVERSION_MAJOR): libchibi-scheme$(SO).$(SOVERSION) libchibi-scheme$(SO).$(SOVERSION_MAJOR): libchibi-scheme$(SO).$(SOVERSION)
$(LN) -sf $< $@ $(LN) -sf $< $@

7
Makefile.detect
View file

@ -53,7 +53,7 @@ EXE =
CLIBFLAGS = CLIBFLAGS =
CLINKFLAGS = -dynamiclib CLINKFLAGS = -dynamiclib
STATICFLAGS = -static-libgcc -DSEXP_USE_DL=0 STATICFLAGS = -static-libgcc -DSEXP_USE_DL=0
LDFLAGS += -install_name $(DESTDIR)$(SOLIBDIR)/libchibi-scheme.dylib LIBCHIBI_FLAGS = -install_name $(DESTDIR)$(SOLIBDIR)/libchibi-scheme.dylib.$(SOVERSION)
else else
ifeq ($(PLATFORM),bsd) ifeq ($(PLATFORM),bsd)
SO = .so SO = .so
@ -69,7 +69,7 @@ CC = gcc
CLIBFLAGS = CLIBFLAGS =
CLINKFLAGS = -shared CLINKFLAGS = -shared
CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 -DBUILDING_DLL CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 -DBUILDING_DLL
LDFLAGS += -Wl,--out-implib,libchibi-scheme$(SO).a LIBCHIBI_FLAGS = -Wl,--out-implib,libchibi-scheme$(SO).a
STATICFLAGS = -DSEXP_USE_DL=0 STATICFLAGS = -DSEXP_USE_DL=0
LIBDL = LIBDL =
else else
@ -80,13 +80,14 @@ CC = gcc
CLIBFLAGS = CLIBFLAGS =
CLINKFLAGS = -shared CLINKFLAGS = -shared
CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0
LDFLAGS += -Wl,--out-implib,libchibi-scheme$(SO).a LIBCHIBI_FLAGS = -Wl,--out-implib,libchibi-scheme$(SO).a
else else
SO = .so SO = .so
EXE = EXE =
CLIBFLAGS = -fPIC CLIBFLAGS = -fPIC
CLINKFLAGS = -shared CLINKFLAGS = -shared
STATICFLAGS = -static -DSEXP_USE_DL=0 STATICFLAGS = -static -DSEXP_USE_DL=0
LIBCHIBI_FLAGS = -Wl,-soname,libchibi-scheme$(SO).$(SOVERSION_MAJOR)
ifeq ($(PLATFORM),BSD) ifeq ($(PLATFORM),BSD)
LIBDL= LIBDL=
RLDFLAGS=-Wl,-R$(DESTDIR)$(LIBDIR) RLDFLAGS=-Wl,-R$(DESTDIR)$(LIBDIR)