aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Leise <marco.leise@gmx.de>2017-04-26 04:24:58 +0200
committerMarco Leise <marco.leise@gmx.de>2017-04-26 04:24:58 +0200
commitc252dddd7bebf5367c6bc3a69395f5cf6d16d8ac (patch)
tree8d77ccb48a93748992f54808c4f1048b9c44c512 /dev-libs
parentAdded a first ebuild for the Tilix virtual terminal. (diff)
downloaddlang-c252dddd7bebf5367c6bc3a69395f5cf6d16d8ac.tar.gz
dlang-c252dddd7bebf5367c6bc3a69395f5cf6d16d8ac.tar.bz2
dlang-c252dddd7bebf5367c6bc3a69395f5cf6d16d8ac.zip
Fixed unnecessary creation of libgtkd-{2,3}.a file during the test phase of gtkd, when static-libs have been disabled.
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/gtkd/gtkd-2.4.2.ebuild11
-rw-r--r--dev-libs/gtkd/gtkd-3.3.0.ebuild11
-rw-r--r--dev-libs/gtkd/gtkd-3.5.1-r1.ebuild9
3 files changed, 17 insertions, 14 deletions
diff --git a/dev-libs/gtkd/gtkd-2.4.2.ebuild b/dev-libs/gtkd/gtkd-2.4.2.ebuild
index 19fd05c..1ed82af 100644
--- a/dev-libs/gtkd/gtkd-2.4.2.ebuild
+++ b/dev-libs/gtkd/gtkd-2.4.2.ebuild
@@ -40,8 +40,9 @@ src_unpack() {
d_src_compile() {
compile_libs() {
# Build the shared library version of the component
+ # The test phase expects no version extension on the .so
if dlang_has_shared_lib_support; then
- dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so.0.${MINOR} \
+ dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \
lib${LIB_NAME}-${MAJOR}.so.0 -Isrc ${GTKD_SRC_DIRS[$i]}/*/*.d
else
ewarn "${DC} does not have shared library support."
@@ -77,9 +78,9 @@ d_src_install() {
# Install the shared library version of the component
if dlang_has_shared_lib_support; then
local libfile="lib${LIB_NAME}-${MAJOR}.so"
- dolib.so "${libfile}.0.${MINOR}"
- dosym "${libfile}.0.${MINOR}" "/usr/$(get_libdir)/${libfile}.0"
- dosym "${libfile}.0.${MINOR}" "/usr/$(get_libdir)/${libfile}"
+ ln -s "${libfile}" "${libfile}.0"
+ ln -s "${libfile}" "${libfile}.0.${MINOR}"
+ dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}"
fi
# Install the static library version
@@ -108,7 +109,7 @@ d_src_install_all() {
foreach_used_component() {
for (( i = 0 ; i < ${#GTKD_LIB_NAMES[@]} ; i++ )); do
- if [[ ${GTKD_LIB_NAMES[$i]} == "gtkd" ]] || use ${GTKD_USE_FLAGS[$i]}; then
+ if [[ "${GTKD_LIB_NAMES[$i]}" == "gtkd" ]] || use ${GTKD_USE_FLAGS[$i]}; then
LIB_NAME=${GTKD_LIB_NAMES[$i]} SRC_DIR=${GTKD_SRC_DIRS[$i]} ${@}
fi
done
diff --git a/dev-libs/gtkd/gtkd-3.3.0.ebuild b/dev-libs/gtkd/gtkd-3.3.0.ebuild
index 844af7f..02b2e55 100644
--- a/dev-libs/gtkd/gtkd-3.3.0.ebuild
+++ b/dev-libs/gtkd/gtkd-3.3.0.ebuild
@@ -40,8 +40,9 @@ src_unpack() {
d_src_compile() {
compile_libs() {
# Build the shared library version of the component
+ # The test phase expects no version extension on the .so
if dlang_has_shared_lib_support; then
- dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so.0.${MINOR} \
+ dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \
lib${LIB_NAME}-${MAJOR}.so.0 -Isrc ${GTKD_SRC_DIRS[$i]}/*/*.d
else
ewarn "${DC} does not have shared library support."
@@ -77,9 +78,9 @@ d_src_install() {
# Install the shared library version of the component
if dlang_has_shared_lib_support; then
local libfile="lib${LIB_NAME}-${MAJOR}.so"
- dolib.so "${libfile}.0.${MINOR}"
- dosym "${libfile}.0.${MINOR}" "/usr/$(get_libdir)/${libfile}.0"
- dosym "${libfile}.0.${MINOR}" "/usr/$(get_libdir)/${libfile}"
+ ln -s "${libfile}" "${libfile}.0"
+ ln -s "${libfile}" "${libfile}.0.${MINOR}"
+ dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}"
fi
# Install the static library version
@@ -108,7 +109,7 @@ d_src_install_all() {
foreach_used_component() {
for (( i = 0 ; i < ${#GTKD_LIB_NAMES[@]} ; i++ )); do
- if [[ ${GTKD_LIB_NAMES[$i]} == "gtkd" ]] || use ${GTKD_USE_FLAGS[$i]}; then
+ if [[ "${GTKD_LIB_NAMES[$i]}" == "gtkd" ]] || use ${GTKD_USE_FLAGS[$i]}; then
LIB_NAME=${GTKD_LIB_NAMES[$i]} SRC_DIR=${GTKD_SRC_DIRS[$i]} ${@}
fi
done
diff --git a/dev-libs/gtkd/gtkd-3.5.1-r1.ebuild b/dev-libs/gtkd/gtkd-3.5.1-r1.ebuild
index 7c378e1..c96f8fe 100644
--- a/dev-libs/gtkd/gtkd-3.5.1-r1.ebuild
+++ b/dev-libs/gtkd/gtkd-3.5.1-r1.ebuild
@@ -41,8 +41,9 @@ src_unpack() {
d_src_compile() {
compile_libs() {
# Build the shared library version of the component
+ # The test phase expects no version extension on the .so
if dlang_has_shared_lib_support; then
- dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so.0.${MINOR} \
+ dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \
lib${LIB_NAME}-${MAJOR}.so.0 -Isrc ${GTKD_SRC_DIRS[$i]}/*/*.d
else
ewarn "${DC} does not have shared library support."
@@ -78,9 +79,9 @@ d_src_install() {
# Install the shared library version of the component
if dlang_has_shared_lib_support; then
local libfile="lib${LIB_NAME}-${MAJOR}.so"
- dolib.so "${libfile}.0.${MINOR}"
- dosym "${libfile}.0.${MINOR}" "/usr/$(get_libdir)/${libfile}.0"
- dosym "${libfile}.0.${MINOR}" "/usr/$(get_libdir)/${libfile}"
+ ln -s "${libfile}" "${libfile}.0"
+ ln -s "${libfile}" "${libfile}.0.${MINOR}"
+ dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}"
fi
# Install the static library version