pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openhexagon: find dependencies in BUILDLINK_DIR
Module Name: pkgsrc-wip
Committed By: Iain Hibbert <plunky%netbsd.org@localhost>
Pushed By: plunky
Date: Tue May 5 14:06:32 2020 +0100
Changeset: b663fd91bc720f15e3b5e6679baf594ad8ceceff
Modified Files:
SSVEntitySystem/Makefile
SSVLuaWrapper/Makefile
SSVStart/Makefile
SSVUtilsJson/Makefile
openhexagon/Makefile
Log Message:
openhexagon: find dependencies in BUILDLINK_DIR
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b663fd91bc720f15e3b5e6679baf594ad8ceceff
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
SSVEntitySystem/Makefile | 2 +-
SSVLuaWrapper/Makefile | 4 ++--
SSVStart/Makefile | 2 +-
SSVUtilsJson/Makefile | 2 +-
openhexagon/Makefile | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diffs:
diff --git a/SSVEntitySystem/Makefile b/SSVEntitySystem/Makefile
index a079c4012f..3c1c2f45e0 100644
--- a/SSVEntitySystem/Makefile
+++ b/SSVEntitySystem/Makefile
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++14
USE_CMAKE= yes
CMAKE_ARGS+= -DBUILD_SHARED_LIB:BOOL=OFF
-CMAKE_ARGS+= -DMODULE_PATH=${PREFIX}/lib/cmake
+CMAKE_ARGS+= -DMODULE_PATH=${BUILDLINK_DIR}/lib/cmake
INSTALLATION_DIRS+= include/${PKGBASE} lib/cmake
diff --git a/SSVLuaWrapper/Makefile b/SSVLuaWrapper/Makefile
index f4506d1fe1..a0fba5bdba 100644
--- a/SSVLuaWrapper/Makefile
+++ b/SSVLuaWrapper/Makefile
@@ -19,8 +19,8 @@ USE_CMAKE= yes
LUA_VERSIONS_ACCEPTED= 51
-CMAKE_ARGS+= -DLUA_LIBRARY=${PREFIX}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
-CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
+CMAKE_ARGS+= -DLUA_LIBRARY=${BUILDLINK_DIR}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
+CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${BUILDLINK_DIR}/${LUA_INCDIR}
CMAKE_ARGS+= -DBUILD_SHARED_LIB:BOOL=OFF
SUBST_CLASSES+= include
diff --git a/SSVStart/Makefile b/SSVStart/Makefile
index 44f14da4bc..0831c64231 100644
--- a/SSVStart/Makefile
+++ b/SSVStart/Makefile
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++14
USE_CMAKE= yes
CMAKE_ARGS+= -DBUILD_SHARED_LIB:BOOL=OFF
-CMAKE_ARGS+= -DMODULE_PATH=${PREFIX}/lib/cmake
+CMAKE_ARGS+= -DMODULE_PATH=${BUILDLINK_DIR}/lib/cmake
INSTALLATION_DIRS+= include/${PKGBASE} lib/cmake
diff --git a/SSVUtilsJson/Makefile b/SSVUtilsJson/Makefile
index afd68b527c..ea0684041e 100644
--- a/SSVUtilsJson/Makefile
+++ b/SSVUtilsJson/Makefile
@@ -18,7 +18,7 @@ USE_LANGUAGES= c c++14
USE_CMAKE= yes
CMAKE_ARGS+= -DBUILD_SHARED_LIB:BOOL=OFF
-CMAKE_ARGS+= -DMODULE_PATH=${PREFIX}/lib/cmake
+CMAKE_ARGS+= -DMODULE_PATH=${BUILDLINK_DIR}/lib/cmake
INSTALLATION_DIRS+= include/${PKGBASE} lib/cmake
diff --git a/openhexagon/Makefile b/openhexagon/Makefile
index 2991be940d..320f11b390 100644
--- a/openhexagon/Makefile
+++ b/openhexagon/Makefile
@@ -27,9 +27,9 @@ SUBST_MESSAGE.wrap= Adjusting wrapper
SUBST_FILES.wrap= ${PKGBASE}
SUBST_VARS.wrap= PREFIX PKGBASE
-CMAKE_ARGS+= -DLUA_LIBRARY=${PREFIX}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
-CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
-CMAKE_ARGS+= -DMODULE_PATH=${PREFIX}/lib/cmake
+CMAKE_ARGS+= -DLUA_LIBRARY=${BUILDLINK_DIR}/lib/liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.so
+CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${BUILDLINK_DIR}/${LUA_INCDIR}
+CMAKE_ARGS+= -DMODULE_PATH=${BUILDLINK_DIR}/lib/cmake
CMAKE_ARGS+= -DPKGBASE=${PKGBASE}
WRKSRC= ${WRKDIR}/${MODULES:MSSVOpenHexagon-*}
Home |
Main Index |
Thread Index |
Old Index