tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

freebsd shlib build fixes

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-01-29 12:36:41 +01:00
parent 4c3873798d
commit e5543b144f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/autoconfig.h.in
View File

@ -117,7 +117,7 @@
/* The __FreeBSD_kernel__ thing is for debian/kfreebsd. */ /* The __FreeBSD_kernel__ thing is for debian/kfreebsd. */
#if _FILE_OFFSET_BITS == 64 || defined(__APPLE__) || defined(__OpenBSD__) ||\ #if _FILE_OFFSET_BITS == 64 || defined(__APPLE__) || defined(__OpenBSD__) ||\
defined(__FreeBSD_kernel__) defined(__FreeBSD_kernel__) || (defined(__FreeBSD__) && __FreeBSD__ >= 9)
#define OFFTPC "%lld" #define OFFTPC "%lld"
#else #else
#define OFFTPC "%ld" #define OFFTPC "%ld"

2
src/lib/Makefile
View File

@ -19,7 +19,7 @@ librecoll.a : $(DEPS) $(OBJS)
# no effort whatsoever to maintain any kind of ABI compat in this lib. Only # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
# programs or modules from the same Recoll release can be compatible. # programs or modules from the same Recoll release can be compatible.
$(LIBRECOLL): $(DEPS) $(OBJS) $(LIBRECOLL): $(DEPS) $(OBJS)
g++ -shared -Wl,--no-undefined -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) -lxapian -lz -lX11 -lpthread -ldl g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS)
rm -f librecoll.so rm -f librecoll.so
ln -s $(LIBRECOLL) librecoll.so ln -s $(LIBRECOLL) librecoll.so

4
src/lib/mkMake
View File

@ -139,9 +139,9 @@ librecoll.a : \$(DEPS) \$(OBJS)
# no effort whatsoever to maintain any kind of ABI compat in this lib. Only # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
# programs or modules from the same Recoll release can be compatible. # programs or modules from the same Recoll release can be compatible.
\$(LIBRECOLL): \$(DEPS) \$(OBJS) \$(LIBRECOLL): \$(DEPS) \$(OBJS)
g++ -shared -Wl,--no-undefined \ g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \
-Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \ -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \
-lxapian -lz -lX11 -lpthread -ldl \$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS)
rm -f librecoll.so rm -f librecoll.so
ln -s \$(LIBRECOLL) librecoll.so ln -s \$(LIBRECOLL) librecoll.so