diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2025-04-19 02:57:20 +0000 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2025-04-24 13:37:31 +0200 |
| commit | b537b382d47025ccdf9b6d38ff98f30cf8418126 (patch) | |
| tree | bbd65e5502f79840d3bbe1c7ed46f060628e3e39 /package | |
| parent | c317530455f95f33711a1ffab287fcd0546603c2 (diff) | |
allow to build xkeyboard w/o xkbcomp on host
Diffstat (limited to 'package')
| -rw-r--r-- | package/libxkbfile/Makefile | 3 | ||||
| -rw-r--r-- | package/xkbcomp/Makefile | 4 | ||||
| -rw-r--r-- | package/xkeyboard-config/Makefile | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 42812796d..e4391eddd 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -15,12 +15,15 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libxkbfile-install: ${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib ${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile index 03da06b23..fd8f421cd 100644 --- a/package/xkbcomp/Makefile +++ b/package/xkbcomp/Makefile @@ -11,16 +11,20 @@ PKG_DESCR:= x11 keyboard compiler PKG_SECTION:= x11/misc PKG_BUILDDEP:= libxkbfile libX11 PKG_DEPENDS:= libxkbfile libx11 +HOST_BUILDDEP:= libxkbfile-host PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) xkbcomp-install: ${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 182812e57..27551639b 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c PKG_DESCR:= keyboard config PKG_SECTION:= x11/misc -PKG_BUILDDEP:= util-macros-host xkbcomp meson-host +PKG_BUILDDEP:= util-macros-host xkbcomp-host xkbcomp meson-host PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ include $(ADK_TOPDIR)/mk/package.mk |