Commit ac3acc83 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs for Linux x64

Patch by Kaloyan Kovachev
(cherry picked from commit 2d81a38b)
parent da467bda
...@@ -77,6 +77,9 @@ case $HOST in ...@@ -77,6 +77,9 @@ case $HOST in
*darwin10*) *darwin10*)
echo "ARCH=x86_64" >> config.mak echo "ARCH=x86_64" >> config.mak
;; ;;
*86_64*)
echo "ARCH=x86_64" >> config.mak
;;
*86*) *86*)
echo "ARCH=i386" >> config.mak echo "ARCH=i386" >> config.mak
;; ;;
...@@ -254,6 +257,15 @@ case $HOST in ...@@ -254,6 +257,15 @@ case $HOST in
cat src/Distributions/unix.mak >> distro.mak cat src/Distributions/unix.mak >> distro.mak
fi fi
;; ;;
*86_64*linux*)
EXTRA_CFLAGS=" -fPIC"
EXTRA_CPPFLAGS=" -fPIC"
EXTRA_LDFLAGS=" -L/usr/lib64"
echo "LIBRARY_PATH = /usr/lib64" >> config.mak
echo "PKG_CONFIG_PATH = /usr/lib64/pkgconfig" >> config.mak
echo "PKG_CONFIG_LIBDIR = /usr/lib64/pkgconfig" >> config.mak
cat src/Distributions/unix.mak >> distro.mak
;;
*) *)
if test "$HOST" = "$BUILD"; then if test "$HOST" = "$BUILD"; then
if test -d "/usr/lib/pkgconfig"; then if test -d "/usr/lib/pkgconfig"; then
......
...@@ -1909,7 +1909,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1 ...@@ -1909,7 +1909,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install) (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
else else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -lgpg-error" $(CIPHDIG) && make && make install)
endif endif
$(INSTALL_NAME) $(INSTALL_NAME)
touch $@ touch $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment