mirror of https://git.wownero.com/dsc/mxe.git
libgeotiff: remove ltmain.sh patch and use autoreconf -fi
This commit is contained in:
parent
a6b2743729
commit
ca2549174c
|
@ -0,0 +1,12 @@
|
|||
diff -burN libgeotiff-1.4.0.orig/configure.ac libgeotiff-1.4.0/configure.ac
|
||||
--- libgeotiff-1.4.0.orig/configure.ac 2015-06-21 03:50:03.341076086 +0200
|
||||
+++ libgeotiff-1.4.0/configure.ac 2015-06-21 03:50:39.741125191 +0200
|
||||
@@ -280,7 +280,7 @@
|
||||
PROJ_INC=-I$PROJ_INC
|
||||
|
||||
AC_SUBST(PROJ_INC,$PROJ_INC)
|
||||
- AC_DEFINE(HAVE_PROJECTS_H)
|
||||
+ AC_DEFINE([HAVE_PROJECTS_H], [], [Description])
|
||||
AC_DEFINE(HAVE_LIBPROJ)
|
||||
AC_SUBST([HAVE_LIBPROJ])
|
||||
PROJ_CONFIG="yes"
|
|
@ -1,12 +0,0 @@
|
|||
diff -bur libgeotiff-1.4.0.orig/ltmain.sh libgeotiff-1.4.0/ltmain.sh
|
||||
--- libgeotiff-1.4.0.orig/ltmain.sh 2014-10-24 01:20:03.172985419 +0530
|
||||
+++ libgeotiff-1.4.0/ltmain.sh 2014-10-24 01:58:50.983491081 +0530
|
||||
@@ -2560,7 +2560,7 @@
|
||||
;;
|
||||
*ar\ archive*) # could be an import, or static
|
||||
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
|
||||
- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||
+ $EGREP 'file format pe-i386(.*architecture: i386)?|pe-x86-64' >/dev/null ; then
|
||||
win32_nmres=`eval $NM -f posix -A $1 |
|
||||
$SED -n -e '
|
||||
1,100{
|
|
@ -20,6 +20,7 @@ endef
|
|||
define $(PKG)_BUILD
|
||||
$(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in'
|
||||
touch '$(1)/configure'
|
||||
cd '$(1)' && autoreconf -fi
|
||||
cd '$(1)' && ./configure \
|
||||
$(MXE_CONFIGURE_OPTS) \
|
||||
--with-jpeg \
|
||||
|
|
Loading…
Reference in New Issue