Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 11 years ago
parent
commit
3427bba6f4
4 changed files with 10 additions and 5 deletions
  1. 4 4
      package/llvm/Makefile
  2. 1 1
      package/scsi-spin/Makefile
  3. 1 0
      package/scsi-spin/src/scsi-spin.c
  4. 4 0
      tools/adk/depmaker.c

+ 4 - 4
package/llvm/Makefile

@@ -4,20 +4,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		llvm
-PKG_VERSION:=		3.3
+PKG_VERSION:=		3.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		40564e1dc390f9844f1711c08b08e391
+PKG_MD5SUM:=		46ed668a1ce38985120dbf6344cf6116
 PKG_DESCR:=		collection of modular and reusable compiler and toolchain technologies
 PKG_SECTION:=		lang
 PKG_URL:=		http://llvm.org/
-PKG_SITES:=		http://llvm.org/releases/3.3/
+PKG_SITES:=		http://llvm.org/releases/3.4/
 
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
 PKG_HOST_DEPENDS:=	!darwin
 PKG_ARCH_DEPENDS:=	mips x86 x86_64 arm
 
+PKG_CFLINE_LLVM:=	depends on ADK_BROKEN
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.src.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.src
 
 include $(TOPDIR)/mk/package.mk
 

+ 1 - 1
package/scsi-spin/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		scsi-spin
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d0c32bfc500e94cc1905d9457a99cdbb
 PKG_DESCR:=		Utility to spin down scsi disks
 PKG_SECTION:=		misc

+ 1 - 0
package/scsi-spin/src/scsi-spin.c

@@ -16,6 +16,7 @@
 */
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>

+ 4 - 0
tools/adk/depmaker.c

@@ -138,6 +138,10 @@ int main() {
 	char *string, *pkgvar, *pkgdeps, *tmp, *fpkg, *cpkg, *spkg, *key, *check, *dpkg;
 	char *stringtmp;
 	int i;
+
+	spkg = NULL;
+	cpkg = NULL;
+	fpkg = NULL;
 	
 	/* read Makefile's for all packages */
 	pkgdir = opendir("package");