Skip to content

Commit d428a4b

Browse files
committed
Use .dylib extension on OSX
1 parent 8a918b2 commit d428a4b

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ rdkafka.pc
88
*.o
99
*.so
1010
*.so.?
11+
*.dylib
1112
*.a
1213
*.d
1314
librdkafka*.lds

mklove/Makefile.base

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ ARFLAGS=
1919

2020
-include $(TOPDIR)/Makefile.config
2121

22+
_UNAME_S := $(shell uname -s)
23+
ifeq ($(_UNAME_S),Darwin)
24+
LIBFILENAME=$(LIBNAME).$(LIBVER).dylib
25+
LIBFILENAMELINK=$(LIBNAME).dylib
26+
else
27+
LIBFILENAME=$(LIBNAME).so.$(LIBVER)
28+
LIBFILENAMELINK=$(LIBNAME).so
29+
endif
30+
2231
INSTALL?= install
2332
INSTALL_PROGRAM?= $(INSTALL)
2433
INSTALL_DATA?= $(INSTALL) -m 644
@@ -64,9 +73,10 @@ mklove-check:
6473
$(CXX) -MD -MP $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
6574

6675

67-
lib: $(LIBNAME).so.$(LIBVER) $(LIBNAME).a
76+
lib: $(LIBFILENAME) $(LIBNAME).a
6877

69-
$(LIBNAME).so.$(LIBVER): $(OBJS) $(LIBNAME).lds
78+
$(LIBFILENAME): $(OBJS) $(LIBNAME).lds
79+
echo "uname is $(_UNAME_S);"
7080
@echo "$(MKL_YELLOW)Creating shared library $@$(MKL_CLR_RESET)"
7181
$(CC) $(LDFLAGS) $(LIB_LDFLAGS) $(OBJS) -o $@ $(LIBS)
7282

@@ -101,16 +111,16 @@ lib-install:
101111
$(INSTALL) -d $$DESTDIR$(libdir) ; \
102112
$(INSTALL) $(HDRS) $$DESTDIR$(includedir)/$(PKGNAME) ; \
103113
$(INSTALL) $(LIBNAME).a $$DESTDIR$(libdir) ; \
104-
$(INSTALL) $(LIBNAME).so.$(LIBVER) $$DESTDIR$(libdir) ; \
105-
(cd $$DESTDIR$(libdir) && ln -sf $(LIBNAME).so.$(LIBVER) $(LIBNAME).so)
114+
$(INSTALL) $(LIBFILENAME) $$DESTDIR$(libdir) ; \
115+
(cd $$DESTDIR$(libdir) && ln -sf $(LIBFILENAME) $(LIBFILENAMELINK))
106116

107117
lib-uninstall:
108118
@echo "$(MKL_YELLOW)Uninstall $(LIBNAME) from $$DESTDIR$(prefix)$(MKL_CLR_RESET)"
109119
for hdr in $(HDRS) ; do \
110120
rm -f $$DESTDIR$(includedir)/$(PKGNAME)/$$hdr ; done
111121
rm -f $$DESTDIR$(libdir)/$(LIBNAME).a
112-
rm -f $$DESTDIR$(libdir)/$(LIBNAME).so.$(LIBVER)
113-
rm -f $$DESTDIR$(libdir)/$(LIBNAME).so
122+
rm -f $$DESTDIR$(libdir)/$(LIBFILENAME)
123+
rm -f $$DESTDIR$(libdir)/$(LIBFILENAMELINK)
114124
rmdir $$DESTDIR$(includedir)/$(PKGNAME) || true
115125

116126

@@ -128,7 +138,7 @@ generic-clean:
128138
rm -f $(OBJS) $(DEPS)
129139

130140
lib-clean: generic-clean
131-
rm -f $(LIBNAME)*.a $(LIBNAME)*.so $(LIBNAME)*.so.$(LIBVER) \
141+
rm -f $(LIBNAME)*.a $(LIBFILENAME) $(LIBFILENAMELINK) \
132142
$(LIBNAME).lds
133143

134144
bin-clean: generic-clean

src-cpp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ WITH_LDS=n
2323

2424
LIBS += -lstdc++
2525

26-
CHECK_FILES+= $(LIBNAME).so.$(LIBVER) $(LIBNAME).a
26+
CHECK_FILES+= $(LIBFILENAME) $(LIBNAME).a
2727

2828
check: file-check
2929

src/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ all: lib check
1818

1919
include ../mklove/Makefile.base
2020

21-
CHECK_FILES+= $(LIBNAME).so.$(LIBVER) $(LIBNAME).a
21+
CHECK_FILES+= $(LIBFILENAME) $(LIBNAME).a
2222

2323
check: file-check
2424
@(printf "%-30s " "Symbol visibility" ; \
25-
(($(SYMDUMPER) librdkafka.so.1 | grep -q rd_kafka_new) && \
26-
($(SYMDUMPER) librdkafka.so.1 | grep -vq rd_kafka_destroy) && \
25+
(($(SYMDUMPER) $(LIBFILENAME) | grep -q rd_kafka_new) && \
26+
($(SYMDUMPER) $(LIBFILENAME) | grep -vq rd_kafka_destroy) && \
2727
echo "\033[32mOK\033[0m") || \
2828
echo "\033[31mFAILED\033[0m")
2929

0 commit comments

Comments
 (0)