Эх сурвалжийг харах

cygwin: fix two issues, // seems broken on cygwin

Waldemar Brodkorb 9 жил өмнө
parent
commit
8f04675f0a

+ 1 - 1
package/flex/Makefile

@@ -10,7 +10,7 @@ PKG_HASH:=		2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f
 PKG_DESCR:=		fast lexical analyzer
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host
-HOST_BUILDDEP:=		m4-host autoconf-host libtool-host
+HOST_BUILDDEP:=		m4-host autoconf-host libtool-host patch-host
 PKG_URL:=		https://github.com/westes/flex
 PKG_SITES:=		https://github.com/westes/flex/releases/download/v2.6.1/
 PKG_OPTS:=		dev

+ 3 - 3
package/libressl/patches/patch-Makefile_in

@@ -1,6 +1,6 @@
---- libressl-2.2.4.orig/Makefile.in	2015-10-16 00:05:34.000000000 +0200
-+++ libressl-2.2.4/Makefile.in	2015-12-06 00:03:23.848314300 +0100
-@@ -360,7 +360,7 @@ target_alias = @target_alias@
+--- libressl-2.4.2.orig/Makefile.in	2016-08-01 01:08:10.000000000 +0200
++++ libressl-2.4.2/Makefile.in	2016-08-22 18:34:29.881419200 +0200
+@@ -361,7 +361,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@

+ 11 - 0
package/libressl/patches/patch-apps_openssl_Makefile_in

@@ -0,0 +1,11 @@
+--- libressl-2.4.2.orig/apps/openssl/Makefile.in	2016-08-01 01:08:10.000000000 +0200
++++ libressl-2.4.2/apps/openssl/Makefile.in	2016-08-22 19:40:55.019614700 +0200
+@@ -844,7 +844,7 @@ install-exec-hook:
+ 	@if [ "@OPENSSLDIR@x" != "x" ]; then \
+ 		OPENSSLDIR="$(DESTDIR)/@OPENSSLDIR@"; \
+ 	else \
+-		OPENSSLDIR="$(DESTDIR)/$(sysconfdir)/ssl"; \
++		OPENSSLDIR="$(DESTDIR)$(sysconfdir)/ssl"; \
+ 	fi; \
+ 	mkdir -p "$$OPENSSLDIR/certs"; \
+ 	for i in cert.pem openssl.cnf x509v3.cnf; do \