瀏覽代碼

some musl fixes

Waldemar Brodkorb 10 年之前
父節點
當前提交
a7f00b82b5
共有 2 個文件被更改,包括 15 次插入2 次删除
  1. 5 1
      package/libgcrypt/Makefile
  2. 10 1
      package/libpciaccess/patches/patch-src_linux_sysfs_c

+ 5 - 1
package/libgcrypt/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libgcrypt
 PKG_VERSION:=		1.5.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		78f8f8bec4580f75b25816f7896d0389
 PKG_DESCR:=		GNU crypto library
 PKG_SECTION:=		libs
@@ -26,5 +26,9 @@ libgcrypt-install:
 	${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgcrypt.so* \
 		${IDIR_LIBGCRYPT}/usr/lib
+	# provides own automake macros
+	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/aclocal
+	${CP} ${WRKINST}//usr/share/aclocal/libgcrypt.m4 \
+		${STAGING_HOST_DIR}/usr/share/aclocal
 
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 10 - 1
package/libpciaccess/patches/patch-src_linux_sysfs_c

@@ -1,5 +1,5 @@
 --- 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
++++ libpciaccess-0.13.1/src/linux_sysfs.c	2013-12-01 18:26:04.000000000 +0100
 @@ -34,6 +34,7 @@
  
  #define _GNU_SOURCE
@@ -8,3 +8,12 @@
  #include <stdlib.h>
  #include <string.h>
  #include <stdio.h>
+@@ -45,7 +46,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
++#if defined(__i386__) || defined(__x86_64__)
+ #include <sys/io.h>
+ #else
+ #define inb(x) -1