diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/libpciaccess | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libpciaccess')
| -rw-r--r-- | package/libpciaccess/Makefile | 18 | ||||
| -rw-r--r-- | package/libpciaccess/patches/patch-src_linux_sysfs_c | 10 |
2 files changed, 13 insertions, 15 deletions
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index e603ac6ab..8b598d792 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -5,32 +5,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libpciaccess PKG_VERSION:= 0.13.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3a95b70913621840bf8af616ea01d7d9 PKG_DESCR:= X.org PCI access library PKG_SECTION:= x11/libs PKG_SITES:= ${MASTER_SITE_XORG} - -PKG_SUBPKGS:= LIBPCIACCESS LIBPCIACCESS_DEV -PKGSD_LIBPCIACCESS_DEV:=X.org PCI access headers -PKGSC_LIBPCIACCESS_DEV:=devel +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBPCIACCESS_DEV,libpciaccess-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCIACCESS_DEV},${PKGSC_LIBPCIACCESS_DEV})) +$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libpciaccess-install: ${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib ${CP} ${WRKINST}/usr/lib/libpciaccess.so* \ ${IDIR_LIBPCIACCESS}/usr/lib -libpciaccess-dev-install: - ${INSTALL_DIR} ${IDIR_LIBPCIACCESS_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/pciaccess.h \ - ${IDIR_LIBPCIACCESS_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_LIBPCIACCESS_DEV}/usr/lib/pkgconfig - ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/pciaccess.pc \ - ${IDIR_LIBPCIACCESS_DEV}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libpciaccess/patches/patch-src_linux_sysfs_c b/package/libpciaccess/patches/patch-src_linux_sysfs_c new file mode 100644 index 000000000..f03152988 --- /dev/null +++ b/package/libpciaccess/patches/patch-src_linux_sysfs_c @@ -0,0 +1,10 @@ +--- libpciaccess-0.13.1.orig/src/linux_sysfs.c 2012-04-09 19:02:57.000000000 +0200 ++++ libpciaccess-0.13.1/src/linux_sysfs.c 2013-10-21 15:25:14.000000000 +0200 +@@ -34,6 +34,7 @@ + + #define _GNU_SOURCE + ++#include <limits.h> + #include <stdlib.h> + #include <string.h> + #include <stdio.h> |