Browse Source

fix cross-compile on Darwin

Waldemar Brodkorb 9 years ago
parent
commit
0705de5042

+ 2 - 2
package/ympd/patches/patch-CMakeLists_txt

@@ -1,5 +1,5 @@
 --- ympd-1.2.2.orig/CMakeLists.txt	2014-09-28 13:39:27.000000000 +0200
-+++ ympd-1.2.2/CMakeLists.txt	2014-09-28 16:12:53.000000000 +0200
++++ ympd-1.2.2/CMakeLists.txt	2014-10-05 00:46:09.000000000 +0200
 @@ -16,9 +16,6 @@ include_directories(${PROJECT_BINARY_DIR
  
  include(CheckCSourceCompiles)
@@ -10,7 +10,7 @@
  file(GLOB RESOURCES 
  	RELATIVE ${PROJECT_SOURCE_DIR}
  	htdocs/js/*
-@@ -28,11 +25,11 @@ file(GLOB RESOURCES
+@@ -28,11 +25,11 @@ file(GLOB RESOURCES 
  	htdocs/index.html
  )
  

+ 35 - 0
package/ympd/patches/patch-htdocs_mkdata_c

@@ -0,0 +1,35 @@
+--- ympd-1.2.2.orig/htdocs/mkdata.c	2014-09-28 13:39:27.000000000 +0200
++++ ympd-1.2.2/htdocs/mkdata.c	2014-10-05 08:52:52.000000000 +0200
+@@ -7,7 +7,6 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <error.h>
+ #include <errno.h>
+ #include <string.h>
+ 
+@@ -58,16 +57,20 @@ int main(int argc, char *argv[])
+     int i, j, buf;
+     FILE *fd;
+ 
+-    if(argc <= 1)
+-        error(EXIT_FAILURE, 0, "Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]);
++    if(argc <= 1) {
++        printf("Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]);
++	exit(EXIT_FAILURE);
++    }
+ 
+     for(i = 1; i < argc; i++)
+     {
+         printf("static const unsigned char v%d[] = {", i);
+         
+         fd = fopen(argv[i], "r");
+-        if(!fd)
+-            error(EXIT_FAILURE, errno, "Failed open file %s", argv[i]);
++        if(!fd) {
++            printf("Failed open file %s", argv[i]);
++	    exit(EXIT_FAILURE);
++	}
+ 
+         j = 0;
+         while((buf = fgetc(fd)) != EOF)