Skip to content

Commit 17ddcc8

Browse files
authored
Merge pull request #12 from golirev/gl-master
Add update versions
2 parents b9c8d47 + 991c42e commit 17ddcc8

File tree

6 files changed

+150
-0
lines changed

6 files changed

+150
-0
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
From b1184c2c41de4efc26866e6fb93cb9c694f14f8f Mon Sep 17 00:00:00 2001
2+
From: Luis Lavena <luislavena@gmail.com>
3+
Date: Sat, 3 Jul 2010 12:48:20 -0300
4+
Subject: [PATCH] Includes should go in includedir, not libdir.
5+
6+
This patch corrects the installation of ffi.h and ffitarget.h
7+
to properly put in $(includedir) instead of $(libdir)
8+
9+
It also avoids prepending package name and version to it, causing
10+
issues by development tools trying to find it.
11+
---
12+
include/Makefile.am | 2 +-
13+
include/Makefile.in | 2 +-
14+
2 files changed, 2 insertions(+), 2 deletions(-)
15+
16+
diff --git a/include/Makefile.am b/include/Makefile.am
17+
index fd28024..15301d6 100644
18+
--- a/include/Makefile.am
19+
+++ b/include/Makefile.am
20+
@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
21+
DISTCLEANFILES=ffitarget.h
22+
EXTRA_DIST=ffi.h.in ffi_common.h
23+
24+
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
25+
+includesdir = $(includedir)
26+
nodist_includes_HEADERS = ffi.h ffitarget.h
27+
diff --git a/include/Makefile.in b/include/Makefile.in
28+
index f370697..c62d6c4 100644
29+
--- a/include/Makefile.in
30+
+++ b/include/Makefile.in
31+
@@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@
32+
AUTOMAKE_OPTIONS = foreign
33+
DISTCLEANFILES = ffitarget.h
34+
EXTRA_DIST = ffi.h.in ffi_common.h
35+
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
36+
+includesdir = $(includedir)
37+
nodist_includes_HEADERS = ffi.h ffitarget.h
38+
all: all-am
39+
40+
--
41+
1.7.1.msysgit.0
42+

libffi/3.2.1/libffi-3.2.1.knapfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
recipe "libffi", "3.2.1" do
2+
use :autotools
3+
use :patch
4+
5+
fetch "ftp://sourceware.org/pub/libffi/#{name}-#{version}.tar.gz",
6+
:md5 => "83b89587607e3eb65c70d361f13bab43"
7+
end

openssl/openssl-1.0.1t.knapfile

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
recipe "openssl", "1.0.1t" do
2+
use :autotools
3+
4+
fetch "https://www.openssl.org/source/openssl-1.0.1t.tar.gz",
5+
:md5 => "9837746fcf8a6727d46d22ca35953da1"
6+
depends_on "zlib"
7+
8+
before :extract do
9+
# ignore symlink errors from package
10+
if platform.mingw?
11+
options.ignore_extract_errors = true
12+
end
13+
end
14+
15+
action :configure do
16+
cmd = ["perl"]
17+
if platform.posix?
18+
cmd << "config"
19+
else
20+
cmd << "Configure"
21+
end
22+
23+
if platform.mingw?
24+
if platform.x64?
25+
cmd << "mingw64"
26+
else
27+
cmd << "mingw"
28+
end
29+
end
30+
31+
cmd << "zlib-dynamic shared"
32+
cmd << "--prefix=#{install_path}"
33+
34+
run cmd.join(" ")
35+
end
36+
end

openssl/openssl-1.0.2h.knapfile

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
recipe "openssl", "1.0.2h" do
2+
use :autotools
3+
4+
fetch "https://www.openssl.org/source/openssl-1.0.2h.tar.gz",
5+
:md5 => "9392e65072ce4b614c1392eefc1f23d0"
6+
depends_on "zlib"
7+
8+
before :extract do
9+
# ignore symlink errors from package
10+
if platform.mingw?
11+
options.ignore_extract_errors = true
12+
end
13+
end
14+
15+
action :configure do
16+
cmd = ["perl"]
17+
if platform.posix?
18+
cmd << "config"
19+
else
20+
cmd << "Configure"
21+
end
22+
23+
if platform.mingw?
24+
if platform.x64?
25+
cmd << "mingw64"
26+
else
27+
cmd << "mingw"
28+
end
29+
end
30+
31+
cmd << "zlib-dynamic shared"
32+
cmd << "--prefix=#{install_path}"
33+
34+
run cmd.join(" ")
35+
end
36+
end

tcl/tcl-8.5.19.knapfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
recipe "tcl", "8.5.19" do
2+
use :autotools
3+
use :patch
4+
5+
fetch "http://prdownloads.sourceforge.net/tcl/#{name}#{version}-src.tar.gz",
6+
:md5 => "4f4e1c919f6a6dbb37e9a12d429769a6"
7+
8+
before :configure do
9+
# FIXME: see why run does not support :chdir
10+
run 'cd win && sh -c "autoconf"'
11+
options.configure = "win/configure"
12+
options.configure_args << "--enable-threads"
13+
end
14+
end

tk/tk-8.5.19.knapfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
recipe "tk", "8.5.19" do
2+
use :autotools
3+
4+
depends_on "tcl"
5+
6+
fetch "http://prdownloads.sourceforge.net/tcl/#{name}#{version}-src.tar.gz",
7+
:md5 => "e89df710447cce0fc0bde65667c12f85"
8+
9+
before :configure do
10+
options.configure = "win/configure"
11+
options.configure_args << "--enable-threads"
12+
tcl_path = Knapsack.work_path("tcl", version, platform)
13+
options.configure_args << "--with-tcl=#{tcl_path}"
14+
end
15+
end

0 commit comments

Comments
 (0)