diff options
| author | Bertrand Jacquin <beber@meleeweb.net> | 2014-06-11 21:36:00 +0200 |
|---|---|---|
| committer | Bertrand Jacquin <beber@meleeweb.net> | 2014-06-11 22:33:29 +0200 |
| commit | 6d17684cd03c8175fbc104e2591ff3371a4ff2da (patch) | |
| tree | fb2623fb7f0d2f87d062569657ef1c68441f1e24 /dev-lang | |
| parent | dev-lang/luajit: vanilla import for work on mingw target (diff) | |
| download | portage-6d17684cd03c8175fbc104e2591ff3371a4ff2da.tar.xz | |
dev-lang/luajit: Support mingw target
Package-Manager: portage-2.2.10
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/luajit/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/luajit/Manifest | 5 | ||||
| -rw-r--r-- | dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch | 38 | ||||
| -rw-r--r-- | dev-lang/luajit/luajit-2.0.2.ebuild | 13 |
4 files changed, 58 insertions, 3 deletions
diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog index c22d0be2..a345a0a6 100644 --- a/dev-lang/luajit/ChangeLog +++ b/dev-lang/luajit/ChangeLog @@ -1,3 +1,8 @@ + 11 Jun 2014; Bertrand Jacquin <beber@meleeweb.net> + +files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch, + luajit-2.0.2.ebuild: + dev-lang/luajit: Support mingw target + *luajit-2.0.2 (11 Jun 2014) 11 Jun 2014; Bertrand Jacquin <beber@meleeweb.net> +luajit-2.0.2.ebuild, diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest index 66ef021e..c2c108a6 100644 --- a/dev-lang/luajit/Manifest +++ b/dev-lang/luajit/Manifest @@ -1,4 +1,5 @@ +AUX 2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch 980 SHA256 d7f61d952ebc38422f0dc9cf9f85e44b40cf01f00d6ed903daee2414a9cd350e WHIRLPOOL 46c047bc9dce6f587aab93d0f7c1e9b4763fc612bb19e7e26f5035662dd1f05598577056cb572244fa6d42dfd6340c50886dd49908aef41990219b3c28275b87 DIST LuaJIT-2.0.2.tar.gz 843031 SHA256 c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38 WHIRLPOOL cb6e8ee6c5ac2293ca5d5452cda34769d3229e2d4681c0ce3c164659c2d2d781f8474e243747b197c10b3abc116e4145df6f5293317f1db871865f38ecd2b6cd -EBUILD luajit-2.0.2.ebuild 1809 SHA256 0716212345c5cd9404c2ed8e5256de50ff267351dfab2a78a962fdc1eea5f67d WHIRLPOOL c50ab03a4943bd3d34cebda097dd6869988ad9620902f284783edb0810036569e5e7587801ed91bebf99e58f3354323a6f383f62c56f8620d601f9be61173872 -MISC ChangeLog 180 SHA256 33396088f4d17438f93cd1ee00597edcaafe37c4b1d8e8b50f7bddac09b45c62 WHIRLPOOL 338209c8ac2e92747f178fbbca9b33033f5b2772ecd987c66310d56a6058580f9c9e1cc297ac1ab31e1d31130d2cb8408dc520d0988a2d14594d3f12677ae330 +EBUILD luajit-2.0.2.ebuild 2051 SHA256 31034b93fab77431050561dcdae02714c691e3a3a008b48493015f1b5b7c28e5 WHIRLPOOL 1663bca6452e109fa0b4b062474c231e682abf87e2105ed4fee2b736064564da83a443c3abc279e03a6274ed9210915c82b163690eba9c437d3e33755b94651e +MISC ChangeLog 361 SHA256 61d23613eef8fa4be317cb1adc736e6b9d5fd67775cbb5978f30f98ccfe1eb01 WHIRLPOOL e112e346f422802a37379446205f7add8e98abf1a2ab57936c8dc95ab230b855f2b4179babea3611ebfe50301075445b715459e1d6c5922ea460f4e6a250af1c MISC metadata.xml 539 SHA256 5b7142766e9999f667d724167a03bce92c66e79dd736cb44dd7f29ad5fa20490 WHIRLPOOL 5383c0894b0fe455a6c1d8eb821936fb8d66205f5796ef365ab6c181c16027ea868e4e3c358c4f8310860a16f4624648a78f7ae7b4e10ab4840d140350fc17c4 diff --git a/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch b/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch new file mode 100644 index 00000000..8a50d23e --- /dev/null +++ b/dev-lang/luajit/files/2.0.2-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch @@ -0,0 +1,38 @@ +From e3b6facaf4df6e556d30799963c0b5b94066906f Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <beber@meleeweb.net> +Date: Wed, 11 Jun 2014 22:18:52 +0200 +Subject: [PATCH] MEDIUM: Makefile: Handle TARGET_SYS=Windows + +--- + Makefile | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/Makefile b/Makefile +index b23b648..83caf4f 100644 +--- a/Makefile ++++ b/Makefile +@@ -95,6 +95,21 @@ ifeq (,$(findstring Windows,$(OS))) + endif + endif + ++ifeq (Windows,$(TARGET_SYS)) ++ FILE_T= luajit.exe ++ INSTALL_TNAME= luajit.exe ++ INSTALL_TSYMNAME= luajit-$(VERSION).exe ++ ++ FILE_SO= lua$(subst .,,$(ABIVER)).dll ++ INSTALL_SONAME= $(FILE_SO) ++ INSTALL_DYN= $(INSTALL_BIN)/$(INSTALL_SONAME) ++ ++ INSTALL_SOSHORT= libluajit-$(ABIVER).dll ++ INSTALL_SHORT1= $(INSTALL_BIN)/$(INSTALL_SOSHORT) ++ INSTALL_SHORT2= $(INSTALL_BIN)/$(INSTALL_SOSHORT) ++endif ++ ++ + ############################################################################## + + INSTALL_DEP= src/luajit +-- +1.8.5.5 + diff --git a/dev-lang/luajit/luajit-2.0.2.ebuild b/dev-lang/luajit/luajit-2.0.2.ebuild index 53cb7b46..fb69409c 100644 --- a/dev-lang/luajit/luajit-2.0.2.ebuild +++ b/dev-lang/luajit/luajit-2.0.2.ebuild @@ -30,8 +30,15 @@ src_prepare(){ if [[ -n ${HOTFIX} ]]; then epatch "${DISTDIR}/${HOTFIX}" fi + + epatch "${FILESDIR}/${PV}-MEDIUM-Makefile-Handle-TARGET_SYS-Windows.patch" + sed -i "s,PREFIX= /usr/local,PREFIX= ${EPREFIX}/usr," Makefile || die 'sed failed.' sed -i "s,/lib,/$(get_libdir)," etc/${PN}.pc || die 'sed2 failed.' + + case "${CHOST}" in + *mingw*) TARGET_SYS=Windows ;; + esac } src_compile() { @@ -42,6 +49,7 @@ src_compile() { HOST_CC="$(tc-getBUILD_CC)" \ STATIC_CC="$(tc-getCC)" \ DYNAMIC_CC="$(tc-getCC) -fPIC" \ + TARGET_SYS="${TARGET_SYS}" \ TARGET_LD="$(tc-getCC)" \ TARGET_AR="$(tc-getAR) rcus" \ TARGET_STRIP="true" \ @@ -55,12 +63,15 @@ src_install(){ HOST_CC="$(tc-getBUILD_CC)" \ STATIC_CC="$(tc-getCC)" \ DYNAMIC_CC="$(tc-getCC) -fPIC" \ + TARGET_SYS="${TARGET_SYS}" \ TARGET_LD="$(tc-getCC)" \ TARGET_AR="$(tc-getAR) rcus" \ TARGET_STRIP="true" \ INSTALL_LIB="${ED%/}/usr/$(get_libdir)" - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" + if [[ ${CHOST} != *mingw* ]] ; then + pax-mark m "${ED}usr/bin/luajit-${MY_PV}" + fi cd "${S}"/doc dohtml -r * |