diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-lua/luasec | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'dev-lua/luasec')
-rw-r--r-- | dev-lua/luasec/Manifest | 2 | ||||
-rw-r--r-- | dev-lua/luasec/luasec-0.9-r102.ebuild (renamed from dev-lua/luasec/luasec-0.9-r101.ebuild) | 28 |
2 files changed, 19 insertions, 11 deletions
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest index 908f2e8b713d..da68d007ab15 100644 --- a/dev-lua/luasec/Manifest +++ b/dev-lua/luasec/Manifest @@ -1,5 +1,5 @@ DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933 -EBUILD luasec-0.9-r101.ebuild 1700 BLAKE2B 9c3c0d01798d56ec9ee4d05c11a2bab66c61223b1c67e56041518de84b5b4a7fa5ceba3bc115703d40ec9bac2462514165717b35e4c8455ae6186a859fbe96d4 SHA512 d454a91b591a2c42d4fea20819c5f21afe1f110f2871eb0208787634b825bed613829f07d102039d71e971672bc238aa5c503818ba1d48467a2b57c6d9fc838c +EBUILD luasec-0.9-r102.ebuild 1569 BLAKE2B b1b658be0eea29ee65475958bc0de8460df7b2986322b37c71be4fba912d963dcc11e973dd891501fd2e1d596d10174e4289c5c7fa8a8575440a865e42c10ebd SHA512 02c167d22737553543c7a17cc5acc2fd256f4976185f371f15046ef46b8334576566b5dce7d3504bda8bb760c03b3c22dc7ade18b8c95d63f821efbcab5ab638 EBUILD luasec-0.9.ebuild 997 BLAKE2B 5e7ce2c2a4a1168fb844890fc586b6ee5a3d87651910b8d5c70bd3309cd8ae8796b1b77f9ea3a6c42accd4c912048b9de7ed320c2e2147ed000d1aa9a70260af SHA512 ca19f37bc58becf4f8b592f223c5588146cec6821f6c5ca0c9689419ca57795b6fa4b636841bf9f44efaec4aa751230a9f695d9faabb20e1e9acc7f7d25764b2 EBUILD luasec-9999.ebuild 1103 BLAKE2B 8d32013bb83b774b57beaeebcdd2687c769c34672be5cbf343155954417850592071591b985fd1771fa7633888a2977c0d92326f5e31732ff7ea141b43f55c3d SHA512 c6c9f13f1b8e62b3f1b4ae06374cdfdd6a99fedbcc61fb4bce8911254e9d295fbdd0f7637ef220a0acc2250a7658e29fb91e0182bc50542e49de51b03bc0cc60 MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660 diff --git a/dev-lua/luasec/luasec-0.9-r101.ebuild b/dev-lua/luasec/luasec-0.9-r102.ebuild index ee3f8ffb8613..dfaab7645f99 100644 --- a/dev-lua/luasec/luasec-0.9-r101.ebuild +++ b/dev-lua/luasec/luasec-0.9-r102.ebuild @@ -19,7 +19,7 @@ IUSE="libressl" REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" - >=dev-lua/luasocket-3.0_rc1_p20200328-r100[${LUA_USEDEP}] + dev-lua/luasocket[${LUA_USEDEP}] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ${LUA_DEPS} @@ -27,19 +27,27 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +lua_src_prepare() { + pushd "${BUILD_DIR}" || die + + ${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die + + popd +} + src_prepare() { default # Respect users CFLAGS sed -e 's/-O2//g' -i src/Makefile || die + + lua_copy_sources + + lua_foreach_impl lua_src_prepare } lua_src_compile() { - # Clean project, to compile it for every lua slot - emake clean - - # Generate SSL options - ${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die + pushd "${BUILD_DIR}" || die local myemakeargs=( "CC=$(tc-getCC)" @@ -52,8 +60,7 @@ lua_src_compile() { emake "${myemakeargs[@]}" linux - # Copy module to match the choosen LUA implementation - cp "src/ssl.so" "src/ssl-${ELUA}.so" || die + popd } src_compile() { @@ -61,8 +68,7 @@ src_compile() { } lua_src_install() { - # Use correct module for the choosen LUA implementation - cp "src/ssl-${ELUA}.so" "src/ssl.so" || die + pushd "${BUILD_DIR}" || die local emakeargs=( "DESTDIR=${ED}" @@ -71,6 +77,8 @@ lua_src_install() { ) emake "${emakeargs[@]}" install + + popd } src_install() { |