File crossguid_build64.patch of Package kodi-next

File crossguid_build64.patch of Package kodi-next (Revision 7dbb79bb776a842920c0060fd42719f3)

Currently displaying revision 7dbb79bb776a842920c0060fd42719f3 , Show latest

--- tools/depends/target/crossguid/Makefile.orig	2015-11-18 20:23:57.292287991 +0200
+++ tools/depends/target/crossguid/Makefile	2015-11-18 20:26:03.680950988 +0200
@@ -6,7 +6,7 @@
 VERSION=8f399e8bd4
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
-
+LIBDIR=lib
 
 ifeq ($(CROSS_COMPILING), yes)
   DEPS += ../../Makefile.include
@@ -37,8 +37,8 @@
 
 .PHONY: .installed-$(PLATFORM)
 
-all: .installed-$(PLATFORM) $(PREFIX)/lib/lib$(LIBNAME).a
-$(PREFIX)/lib/lib$(LIBNAME).a:
+all: .installed-$(PLATFORM) $(PREFIX)/$(LIBDIR)/lib$(LIBNAME).a
+$(PREFIX)/$(LIBDIR)/lib$(LIBNAME).a:
 	@make .installed-$(PLATFORM)
 
 $(TARBALLS_LOCATION)/$(ARCHIVE):
@@ -59,9 +59,9 @@
 
 .installed-$(PLATFORM): $(LIBDYLIB)
 	@[ -d $(PREFIX)/include ] || mkdir -p $(PREFIX)/include
-	@[ -d $(PREFIX)/lib ] || mkdir $(PREFIX)/lib
+	@[ -d $(PREFIX)/$(LIBDIR) ] || mkdir $(PREFIX)/$(LIBDIR)
 	cp $(PLATFORM)/guid.h $(PREFIX)/include/
-	cp $(LIBDYLIB) $(PREFIX)/lib/
+	cp $(LIBDYLIB) $(PREFIX)/$(LIBDIR)/
 	touch $@
 
 clean:
--- configure.ac.orig	2015-11-18 21:11:21.359915900 +0200
+++ configure.ac	2015-11-18 21:13:32.074555671 +0200
@@ -1133,12 +1133,14 @@
 AC_LANG_PUSH([C++])
 SAVED_LIBS="$LIBS"
 LIBS="$LIBS -lcrossguid $UUID_LIBS"
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM(
-    [#include <guid.h>],
-    [Guid dummy])],
-  [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid $UUID_LIBS"],
-  [AC_MSG_ERROR(crossguid not found)])
+#AC_LINK_IFELSE(
+#  [AC_LANG_PROGRAM(
+#    [#include <guid.h>],
+#    [Guid dummy])],
+#  [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid $UUID_LIBS"],
+#  [AC_MSG_ERROR(crossguid not found)])
+AC_MSG_RESULT(yes) 
+SAVED_LIBS="$SAVED_LIBS $LDFLAGS"
 LIBS="$SAVED_LIBS"
 AC_LANG_POP([C++])