You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.7 KiB
46 lines
1.7 KiB
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
From 2de67e2eedc9bd458c1e5170ae43d815b466f012 Mon Sep 17 00:00:00 2001
|
|
From: Volker Grabsch <vog@notjusthosting.com>
|
|
Date: Sun, 15 Jan 2017 16:10:19 +0100
|
|
Subject: [PATCH] build fix for mxe static
|
|
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 1852192..c88f5b5 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -310,12 +310,12 @@ install-libs: $(LIBS)
|
|
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
|
|
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
|
|
rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
|
|
- cp $(STATICLIB) $(DESTDIR)$(libdir)
|
|
+ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
|
|
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
|
|
-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
|
|
-@if test -n "$(SHAREDLIBV)"; then \
|
|
rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
|
|
- 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 e974d1f..f023947 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -215,10 +215,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
|
|
CYGWIN* | Cygwin* | cygwin* | OS/2*)
|
|
EXE='.exe' ;;
|
|
MINGW* | mingw*)
|
|
-# temporary bypass
|
|
rm -f $test.[co] $test $test$shared_ext
|
|
- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
|
|
- leave 1
|
|
LDSHARED=${LDSHARED-"$cc -shared"}
|
|
LDSHAREDLIBC=""
|
|
EXE='.exe' ;;
|
|
--
|
|
2.9.3
|
|
|