From 49a9474fa0af71be3e7c7140504ada609816c7ea Mon Sep 17 00:00:00 2001 From: kenmays Date: Sat, 30 Jan 2021 02:48:37 -0800 Subject: [PATCH] dfu-util: Added x86 build for Haiku R1B2 (#5629) --- app-mobilephone/dfu-util/dfu_util-0.8.recipe | 50 ------------------- app-mobilephone/dfu-util/dfu_util-0.9.recipe | 36 ++++++++----- .../dfu-util/patches/dfu_util-0.8.patchset | 32 ------------ .../dfu-util/patches/dfu_util-0.9.patchset | 8 +-- 4 files changed, 27 insertions(+), 99 deletions(-) delete mode 100644 app-mobilephone/dfu-util/dfu_util-0.8.recipe delete mode 100644 app-mobilephone/dfu-util/patches/dfu_util-0.8.patchset diff --git a/app-mobilephone/dfu-util/dfu_util-0.8.recipe b/app-mobilephone/dfu-util/dfu_util-0.8.recipe deleted file mode 100644 index a746eb5d1..000000000 --- a/app-mobilephone/dfu-util/dfu_util-0.8.recipe +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY="Device Firmware Upgrade Utilities" -DESCRIPTION="dfu-util is a host side implementation of the DFU 1.0 and DFU 1.1 \ -specifications of the USB forum. DFU is intended to download and upload \ -firmware to/from devices connected over USB. It ranges from small devices like \ -micro-controller boards to mobile phones. Using dfu-util you can download \ -firmware to your DFU-enabled device or upload firmware from it. dfu-util has \ -been tested with the Openmoko Neo1973 and Freerunner and many other devices." -HOMEPAGE="http://dfu-util.sourceforge.net" -COPYRIGHT="2010-2012 Stefan Schmidt" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="${HOMEPAGE}/releases/dfu-util-$portVersion.tar.gz" -CHECKSUM_SHA256="55cbde9be12a212bd84bce9d1e63941d9a16139ed0d4912401367eba1502f058" -SOURCE_DIR="dfu-util-$portVersion" -PATCHES="dfu_util-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2" - -PROVIDES=" - dfu_util = $portVersion - cmd:dfu_prefix - cmd:dfu_suffix - cmd:dfu_util - " -REQUIRES=" - haiku - lib:libusb_1.0 - " - -BUILD_REQUIRES=" - devel:libusb_1.0 - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:awk - cmd:gcc - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - CFLAGS=-D_BSD_SOURCE runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install -} diff --git a/app-mobilephone/dfu-util/dfu_util-0.9.recipe b/app-mobilephone/dfu-util/dfu_util-0.9.recipe index 203dac998..d7ad70122 100644 --- a/app-mobilephone/dfu-util/dfu_util-0.9.recipe +++ b/app-mobilephone/dfu-util/dfu_util-0.9.recipe @@ -6,41 +6,51 @@ micro-controller boards to mobile phones. Using dfu-util you can download \ firmware to your DFU-enabled device or upload firmware from it. dfu-util has \ been tested with the Openmoko Neo1973 and Freerunner and many other devices." HOMEPAGE="http://dfu-util.sourceforge.net" -COPYRIGHT="2010-2012 Stefan Schmidt" +COPYRIGHT="2010-2016 Stefan Schmidt & Tormod Volden" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="${HOMEPAGE}/releases/dfu-util-$portVersion.tar.gz" CHECKSUM_SHA256="36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833" SOURCE_DIR="dfu-util-$portVersion" PATCHES="dfu_util-$portVersion.patchset" -ARCHITECTURES="?x86_gcc2 x86_64" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" + +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi PROVIDES=" - dfu_util = $portVersion - cmd:dfu_prefix - cmd:dfu_suffix - cmd:dfu_util + dfu_util$secondaryArchSuffix = $portVersion + cmd:dfu_prefix$commandSuffix + cmd:dfu_suffix$commandSuffix + cmd:dfu_util$commandSuffix " REQUIRES=" - haiku - lib:libusb_1.0 + haiku$secondaryArchSuffix + lib:libusb_1.0$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libusb_1.0 + devel:libusb_1.0$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel cmd:awk - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " BUILD() { - CFLAGS=-D_BSD_SOURCE runConfigure ./configure + export CFLAGS="-D_BSD_SOURCE" + runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir make $jobArgs } diff --git a/app-mobilephone/dfu-util/patches/dfu_util-0.8.patchset b/app-mobilephone/dfu-util/patches/dfu_util-0.8.patchset deleted file mode 100644 index 8c928b4d2..000000000 --- a/app-mobilephone/dfu-util/patches/dfu_util-0.8.patchset +++ /dev/null @@ -1,32 +0,0 @@ -From 816414b551b15fe63bdbe06d58eaf1a6f2719ccb Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 27 Nov 2014 16:58:10 +0000 -Subject: remove unrecognized gcc option - - -diff --git a/src/Makefile.am b/src/Makefile.am -index 70179c4..bc6ccf6 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS = -Wall -Wextra -+AM_CFLAGS = -Wall - - bin_PROGRAMS = dfu-util dfu-suffix dfu-prefix - dfu_util_SOURCES = main.c \ -diff --git a/src/Makefile.in b/src/Makefile.in -index 1542812..597e0d8 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -198,7 +198,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CFLAGS = -Wall -Wextra -+AM_CFLAGS = -Wall - dfu_util_SOURCES = main.c \ - portable.h \ - dfu_load.c \ --- -1.8.3.4 - diff --git a/app-mobilephone/dfu-util/patches/dfu_util-0.9.patchset b/app-mobilephone/dfu-util/patches/dfu_util-0.9.patchset index 8c928b4d2..05782948e 100644 --- a/app-mobilephone/dfu-util/patches/dfu_util-0.9.patchset +++ b/app-mobilephone/dfu-util/patches/dfu_util-0.9.patchset @@ -1,4 +1,4 @@ -From 816414b551b15fe63bdbe06d58eaf1a6f2719ccb Mon Sep 17 00:00:00 2001 +From 9e623d25ef366ead29beb5c71b6b3613d7ce8137 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 27 Nov 2014 16:58:10 +0000 Subject: remove unrecognized gcc option @@ -15,10 +15,10 @@ index 70179c4..bc6ccf6 100644 bin_PROGRAMS = dfu-util dfu-suffix dfu-prefix dfu_util_SOURCES = main.c \ diff --git a/src/Makefile.in b/src/Makefile.in -index 1542812..597e0d8 100644 +index 7f0f072..46215a4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -198,7 +198,7 @@ target_alias = @target_alias@ +@@ -251,7 +251,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -28,5 +28,5 @@ index 1542812..597e0d8 100644 portable.h \ dfu_load.c \ -- -1.8.3.4 +2.30.0