diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
| commit | a74b8da459dcdee1d1fc633d9d1856fdb89fd7bd (patch) | |
| tree | 291ff6b5793e74c8994696a7fe26e82f6f646601 /package/util-macros | |
| parent | 33adad70313bb73464cbd002370cd14bade79a54 (diff) | |
fix musl compile, when xorg package collection is selected. X still does not work with musl
Diffstat (limited to 'package/util-macros')
| -rw-r--r-- | package/util-macros/Makefile | 27 | ||||
| -rw-r--r-- | package/util-macros/patches/patch-Makefile_am | 11 | ||||
| -rw-r--r-- | package/util-macros/patches/patch-Makefile_in | 11 |
3 files changed, 49 insertions, 0 deletions
diff --git a/package/util-macros/Makefile b/package/util-macros/Makefile new file mode 100644 index 000000000..83f2827e9 --- /dev/null +++ b/package/util-macros/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= util-macros +PKG_VERSION:= 1.8.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fe73a69d02bd0be6cdf7c773bfd72041 +PKG_DESCR:= xorg macros +PKG_SECTION:= x11/misc +PKG_BUILDDEP:= autotool util-macros-host +PKG_URL:= http://cgit.freedesktop.org/xorg/util/macros +PKG_SITES:= http://xorg.freedesktop.org/archive/individual/util/ +PKG_OPTS:= dev devonly + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +HOST_STYLE:= auto +AUTOTOOL_STYLE:= autoreconf + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/util-macros/patches/patch-Makefile_am b/package/util-macros/patches/patch-Makefile_am new file mode 100644 index 000000000..40e2951d5 --- /dev/null +++ b/package/util-macros/patches/patch-Makefile_am @@ -0,0 +1,11 @@ +--- util-macros-1.8.0.orig/Makefile.am 2010-03-29 17:47:02.000000000 +0200 ++++ util-macros-1.8.0/Makefile.am 2013-10-28 18:08:50.000000000 +0100 +@@ -29,7 +29,7 @@ dist_pkgdata_DATA = INSTALL + install-data-hook: + rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4 + +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xorg-macros.pc + + .PHONY: ChangeLog diff --git a/package/util-macros/patches/patch-Makefile_in b/package/util-macros/patches/patch-Makefile_in new file mode 100644 index 000000000..1d472707b --- /dev/null +++ b/package/util-macros/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- util-macros-1.8.0.orig/Makefile.in 2010-05-27 21:02:01.000000000 +0200 ++++ util-macros-1.8.0/Makefile.in 2013-10-28 18:32:09.000000000 +0100 +@@ -167,7 +167,7 @@ top_srcdir = @top_srcdir@ + aclocaldir = $(datadir)/aclocal + aclocal_DATA = xorg-macros.m4 + dist_pkgdata_DATA = INSTALL +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xorg-macros.pc + all: all-am + |