From f9a5bb2bf7efb7d32814fb5ed2c66489d27ceed5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 4 Jun 2015 11:15:57 +0200
Subject: set endian mode correctly

---
 package/cdrkit/Makefile               |  6 ++++++
 package/cdrkit/patches/patch-Makefile | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'package/cdrkit')

diff --git a/package/cdrkit/Makefile b/package/cdrkit/Makefile
index 45adc5712..e4c483bfe 100644
--- a/package/cdrkit/Makefile
+++ b/package/cdrkit/Makefile
@@ -25,6 +25,12 @@ $(eval $(call PKG_template,CDRKIT,cdrkit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP
 CONFIG_STYLE:=          cmake
 CMAKE_FLAGS+=		-DUSE_LIBC_NLS=1 -DUSE_LIBXNET=0 -DUSE_LIBNLS=0
 
+ifeq ($(ADK_TARGET_ENDIAN),little)
+CMAKE_FLAGS+=		-DBITFIELDS_HTOL=0
+else
+CMAKE_FLAGS+=		-DBITFIELDS_HTOL=1
+endif
+
 cdrkit-install:
 	$(INSTALL_DIR) $(IDIR_CDRKIT)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
diff --git a/package/cdrkit/patches/patch-Makefile b/package/cdrkit/patches/patch-Makefile
index adf3bd7e2..b4b1ce790 100644
--- a/package/cdrkit/patches/patch-Makefile
+++ b/package/cdrkit/patches/patch-Makefile
@@ -1,11 +1,11 @@
 --- cdrkit-1.1.11.orig/Makefile	2007-05-06 12:23:54.000000000 +0200
-+++ cdrkit-1.1.11/Makefile	2015-02-25 10:54:08.000000000 +0100
-@@ -1,72 +1,409 @@
++++ cdrkit-1.1.11/Makefile	2015-05-31 21:33:44.000000000 +0200
+@@ -1,72 +1,408 @@
 -ifneq ($(CFLAGS),)
 -CMAKETWEAKS += ( cd build ; cmake .. -DCMAKE_C_FLAGS="$(CFLAGS)" ) || exit 1; 
 -endif
 +# CMAKE generated file: DO NOT EDIT!
-+# Generated by "Unix Makefiles" Generator, CMake Version 3.1
++# Generated by "Unix Makefiles" Generator, CMake Version 3.2
  
 -ifneq ($(LDFLAGS),)
 -CMAKETWEAKS += (cd build ; cmake .. -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" ) || exit 1; 
@@ -19,7 +19,6 @@
 -endif
 +# Allow only one "make -f Makefile2" at a time, but pass parallelism.
 +.NOTPARALLEL:
-+.PHONY : .NOTPARALLEL
  
 -ifneq ($(MANSUBDIR),)
 -CMAKETWEAKS += ( cd build ;  cmake .. -DMANSUBDIR="$(MANSUBDIR)" ) || exit 1; 
@@ -64,15 +63,15 @@
 +
 +# The command to remove a file.
 +RM = /home/wbx/adk/host_x86_64-linux-gnu/usr/bin/cmake -E remove -f
- 
++
 +# Escaping for special characters.
 +EQUALS = =
 +
 +# The top-level source directory on which CMake was run.
-+CMAKE_SOURCE_DIR = /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11
++CMAKE_SOURCE_DIR = /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11
 +
 +# The top-level build directory on which CMake was run.
-+CMAKE_BINARY_DIR = /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11
++CMAKE_BINARY_DIR = /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11
 +
 +#=============================================================================
 +# Targets provided globally by CMake.
@@ -140,11 +139,11 @@
 +
 +# The main all target
 +all: cmake_check_build_system
-+	$(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles/progress.marks
++	$(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles/progress.marks
 +	$(MAKE) -f CMakeFiles/Makefile2 all
-+	$(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_qemu-arm_uclibc-ng_arm_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles 0
++	$(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/adk/build_raspberry-pi_uclibc-ng_arm_hard_eabihf/w-cdrkit-1.1.11-1/cdrkit-1.1.11/CMakeFiles 0
 +.PHONY : all
-+
+ 
 +# The main clean target
  clean:
 -	rm -rf build
@@ -212,7 +211,7 @@
 +devdump/fast:
 +	$(MAKE) -f genisoimage/CMakeFiles/devdump.dir/build.make genisoimage/CMakeFiles/devdump.dir/build
 +.PHONY : devdump/fast
- 
++
 +#=============================================================================
 +# Target rules for targets named genisoimage
 +
@@ -407,7 +406,7 @@
 +readom/fast:
 +	$(MAKE) -f readom/CMakeFiles/readom.dir/build.make readom/CMakeFiles/readom.dir/build
 +.PHONY : readom/fast
-+
+ 
 +#=============================================================================
 +# Target rules for targets named netscsid
 +
-- 
cgit v1.2.3