debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add infrastructure for building shared library on OS X.

Browse source 
This patch adds a configure check for OS X (actually Darwin),
and sets up the Makefiles to build a proper shared library on
that platform.

Signed-off-by: Aaron Ecay <aaronecay@gmail.com>
This commit is contained in:
Aaron Ecay 2010-04-11 19:44:53 -04:00 committed by Carl Worth
parent f206408358
commit 8c8079a8b1
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.local
View file

@ -199,7 +199,7 @@ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
notmuch: $(notmuch_client_modules) lib/libnotmuch.a notmuch: $(notmuch_client_modules) lib/libnotmuch.a
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@ $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
$(call quiet,CXX $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@ $(call quiet,CXX $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@
notmuch.1.gz: notmuch.1 notmuch.1.gz: notmuch.1

13
configure vendored
View file

@ -234,6 +234,15 @@ else
have_emacs=0 have_emacs=0
fi fi
printf "Checking for Mac OS X (for shared library)... "
if [ `uname` = "Darwin" ] ; then
printf "Yes.\n"
mac_os_x=1
else
printf "No.\n"
mac_os_x=0
fi
if [ $errors -gt 0 ]; then if [ $errors -gt 0 ]; then
cat <<EOF cat <<EOF
@ -399,6 +408,10 @@ HAVE_GETLINE = ${have_getline}
# build its own version) # build its own version)
HAVE_STRCASESTR = ${have_strcasestr} HAVE_STRCASESTR = ${have_strcasestr}
# Whether we are building on OS X. This will affect how we build the
# shared library.
MAC_OS_X = ${mac_os_x}
# Flags needed to compile and link against Xapian # Flags needed to compile and link against Xapian
XAPIAN_CXXFLAGS = ${xapian_cxxflags} XAPIAN_CXXFLAGS = ${xapian_cxxflags}
XAPIAN_LDFLAGS = ${xapian_ldflags} XAPIAN_LDFLAGS = ${xapian_ldflags}

15
lib/Makefile.local
View file

@ -22,9 +22,20 @@ LIBNOTMUCH_VERSION_MINOR = 0
# simply compatible changes to the implementation). # simply compatible changes to the implementation).
LIBNOTMUCH_VERSION_RELEASE = 0 LIBNOTMUCH_VERSION_RELEASE = 0
LINKER_NAME = libnotmuch.so ifeq ($(MAC_OS_X),1)
LIBRARY_SUFFIX = dylib
# On OS X, library version numbers go before suffix.
LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
SONAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBRARY_SUFFIX)
LIBNAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE).$(LIBRARY_SUFFIX)
LIBRARY_LINK_FLAG = -Wl,-dylib_install_name -Wl,$(SONAME)
else
LIBRARY_SUFFIX = so
LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR) SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)
LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE) LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
LIBRARY_LINK_FLAG = -Wl,-soname=$(SONAME)
endif
dir := lib dir := lib
extra_cflags += -I$(dir) -fPIC extra_cflags += -I$(dir) -fPIC
@ -52,7 +63,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
$(call quiet,AR) rcs $@ $^ $(call quiet,AR) rcs $@ $^
$(dir)/$(LIBNAME): $(libnotmuch_modules) $(dir)/$(LIBNAME): $(libnotmuch_modules)
$(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -shared $(LIBRARY_LINK_FLAG) -o $@
$(dir)/$(SONAME): $(dir)/$(LIBNAME) $(dir)/$(SONAME): $(dir)/$(LIBNAME)
ln -sf $(LIBNAME) $@ ln -sf $(LIBNAME) $@