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

use static linking on macosx

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-01-04 14:15:34 +01:00
parent 9b55eb1cda
commit 5f61c2edff
7 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/configure vendored
View File

@ -4341,9 +4341,10 @@ _ACEOF
fi fi
fi fi
# Enable use of file extended attributes. # Enable use of file extended attributes. Not by default as extended
# Not by default as extended attributes are little used for now, and # attributes are little used for now, and looking for them is not
# looking for them is not completely trivial # completely trivial: we have to use ctime instead of mtime to detect
# changes.
# Check whether --enable-xattr was given. # Check whether --enable-xattr was given.
if test "${enable_xattr+set}" = set; then : if test "${enable_xattr+set}" = set; then :
enableval=$enable_xattr; xattrEnabled=$enableval enableval=$enable_xattr; xattrEnabled=$enableval

3
src/lib/Makefile
View File

@ -3,7 +3,8 @@ depth = ..
include $(depth)/mk/sysconf include $(depth)/mk/sysconf
LIBRECOLL=librecoll.so.$(RCLLIBVERSION) LIBRECOLL=librecoll.so.$(RCLLIBVERSION)
LIBS = librecoll.a $(LIBRECOLL) LIBS = librecoll.a
@NODYNLIB@LIBS = librecoll.a $(LIBRECOLL)
all: $(LIBS) all: $(LIBS)

8
src/lib/mkMake
View File

@ -2,6 +2,7 @@
mk=Makefile mk=Makefile
depth=${depth:-..} depth=${depth:-..}
sys=`uname`
SRC_CPP="\ SRC_CPP="\
${depth}/aspell/rclaspell.cpp \ ${depth}/aspell/rclaspell.cpp \
@ -110,13 +111,18 @@ defs=\$\(depth\)/mk/localdefs
test -f $mk && chmod +w $mk test -f $mk && chmod +w $mk
if test $sys = "Darwin";then
NODYNLIB='#'
fi
cat > $mk <<EOF cat > $mk <<EOF
# DONT EDIT BY HAND: created by script mkMake # DONT EDIT BY HAND: created by script mkMake
depth = ${depth} depth = ${depth}
include \$(depth)/mk/sysconf include \$(depth)/mk/sysconf
LIBRECOLL=librecoll.so.\$(RCLLIBVERSION) LIBRECOLL=librecoll.so.\$(RCLLIBVERSION)
LIBS = librecoll.a \$(LIBRECOLL) LIBS = librecoll.a
${NODYNLIB}LIBS = librecoll.a \$(LIBRECOLL)
all: \$(LIBS) all: \$(LIBS)

2
src/mk/Darwin
View File

@ -3,5 +3,7 @@ include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS)
LIBRECOLL = -L$(depth)/lib -lrecoll
RANLIB = ranlib RANLIB = ranlib
LIBSYS = LIBSYS =

2
src/mk/commondefs
View File

@ -15,7 +15,7 @@ COMMONCXXFLAGS = -I. \
# the sys file or localdefs # the sys file or localdefs
SYSPICFLAGS = -fPIC -DPIC SYSPICFLAGS = -fPIC -DPIC
LIBRECOLL = -L $(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll LIBRECOLL = -L$(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll
RANLIB = test -f RANLIB = test -f
AR=ar AR=ar

13
src/qtgui/recoll.pro.in
View File

@ -83,8 +83,13 @@ unix {
# Note: libdir may be substituted with sthing like $(exec_prefix)/lib # Note: libdir may be substituted with sthing like $(exec_prefix)/lib
# at this point and will go as such in the Makefile. Expansion will be # at this point and will go as such in the Makefile. Expansion will be
# completed at make time. # completed at make time.
LIBS += $(BSTATIC) -L../lib -lrecoll -Wl,-rpath=@libdir@/recoll \ LIBS += $(BSTATIC) -L../lib -lrecoll
@LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
!macx {
LIBS += -Wl,-rpath=@libdir@/recoll
}
LIBS += @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
@LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
INCLUDEPATH += ../common ../index ../internfile ../query ../unac \ INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
@ -103,6 +108,10 @@ contains( UNAME, SunOS ) {
LIBS += -ldl LIBS += -ldl
} }
macx {
ICON = images/recoll.icns
}
TRANSLATIONS = \ TRANSLATIONS = \
i18n/recoll_cs.ts \ i18n/recoll_cs.ts \
i18n/recoll_de.ts \ i18n/recoll_de.ts \

8
tests/badsuffs1/badsuffs1.txt
View File

@ -1,7 +1,7 @@
6 results 6 results
[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz] [badsufffilename.log.gz] 19 bytes
[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5] [badsufffilename.md5] 19 bytes
application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2] [badsufffilename.tar.bz2] 19 bytes application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2] [badsufffilename.tar.bz2] 19 bytes
application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz] [badsufffilename.tar.gz] 19 bytes
application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz] [badsufffilename.tbz] 19 bytes
application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tgz] [badsufffilename.tgz] 19 bytes application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tgz] [badsufffilename.tgz] 19 bytes
[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz] [badsufffilename.log.gz] 19 bytes
application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz] [badsufffilename.tbz] 19 bytes
[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5] [badsufffilename.md5] 19 bytes
application/x-tar [file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz] [badsufffilename.tar.gz] 19 bytes