2010-04-21 08:58:44 +01:00
|
|
|
This file is part of mingw-cross-env.
|
|
|
|
|
See doc/index.html for further information.
|
|
|
|
|
|
2012-01-29 20:53:13 +00:00
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
|
|
|
|
|
|
From dfe5701faf3683be7ea53885c58d4bd3499c4d1c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: mingw-cross-env
|
|
|
|
|
Date: Sun, 29 Jan 2012 21:51:03 +0100
|
|
|
|
|
Subject: [PATCH] workarounds for mingw-cross-env
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
|
|
|
index ea430bf..f2573e7 100644
|
|
|
|
|
--- a/Makefile.in
|
|
|
|
|
+++ b/Makefile.in
|
|
|
|
|
@@ -188,11 +188,11 @@ install-libs: $(LIBS)
|
2010-04-20 16:49:41 +01:00
|
|
|
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
|
|
|
|
|
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
|
|
|
|
|
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
|
|
|
|
|
- cp $(STATICLIB) $(DESTDIR)$(libdir)
|
|
|
|
|
+ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
|
2012-01-29 20:53:13 +00:00
|
|
|
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
|
|
|
|
|
-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
|
|
|
|
|
-@if test -n "$(SHAREDLIBV)"; then \
|
|
|
|
|
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
|
|
|
|
|
+ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
|
|
|
|
|
echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
|
|
|
|
|
chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
|
|
|
|
|
echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
|
|
|
|
|
diff --git a/configure b/configure
|
|
|
|
|
index 780317c..6e6a033 100755
|
|
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
|
|
|
|
@@ -180,10 +180,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then
|
2010-04-20 16:49:41 +01:00
|
|
|
CYGWIN* | Cygwin* | cygwin* | OS/2*)
|
|
|
|
|
EXE='.exe' ;;
|
2012-01-29 20:53:13 +00:00
|
|
|
MINGW* | mingw*)
|
2010-04-20 16:49:41 +01:00
|
|
|
-# temporary bypass
|
|
|
|
|
rm -f $test.[co] $test $test$shared_ext
|
2012-01-29 20:53:13 +00:00
|
|
|
- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
|
2010-04-20 16:49:41 +01:00
|
|
|
- exit 1
|
|
|
|
|
LDSHARED=${LDSHARED-"$cc -shared"}
|
|
|
|
|
LDSHAREDLIBC=""
|
|
|
|
|
EXE='.exe' ;;
|
2012-01-29 20:53:13 +00:00
|
|
|
--
|
|
|
|
|
1.7.8.3
|
|
|
|
|
|
