From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 10 Apr 2017 09:32:01 +0000 (+0200)
Subject: doozer: add fedora24-x86_64 and centos7-x86_64 targets
X-Git-Tag: v4.2.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3356759d84487a0e650d68801bc2e49cbd59008b;p=thirdparty%2Ftvheadend.git

doozer: add fedora24-x86_64 and centos7-x86_64 targets
---

diff --git a/.doozer.json b/.doozer.json
index b8fca0614..95a0f35b3 100644
--- a/.doozer.json
+++ b/.doozer.json
@@ -240,6 +240,58 @@
       "buildcmd": [
         "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}"
       ]
+    },
+    "fedora24-x86_64": {
+      "buildenv": "fedora24-x86_64",
+      "builddeps": [
+        "gcc-c++",
+        "which",
+        "rpm-build",
+        "rpmdevtools",
+        "git",
+        "make",
+        "cmake",
+        "gettext-devel",
+        "dbus-devel",
+        "avahi-devel",
+        "openssl-devel",
+        "zlib-devel",
+        "wget",
+        "bzip2",
+        "uriparser-devel",
+        "python",
+        "ccache",
+        "strace"
+      ],
+      "buildcmd": [
+        "./configure && make -C rpm build-doozer"
+      ]
+    },
+    "centos7-x86_64": {
+      "buildenv": "centos7-x86_64",
+      "builddeps": [
+        "gcc-c++",
+        "which",
+        "rpm-build",
+        "rpmdevtools",
+        "git",
+        "make",
+        "cmake",
+        "gettext-devel",
+        "dbus-devel",
+        "avahi-devel",
+        "openssl-devel",
+        "zlib-devel",
+        "wget",
+        "bzip2",
+        "uriparser-devel",
+        "python",
+        "ccache",
+        "strace"
+      ],
+      "buildcmd": [
+        "./configure && make -C rpm build-doozer"
+      ]
     }
   }
 }
diff --git a/configure b/configure
index 3b8b12420..3a266ed7b 100755
--- a/configure
+++ b/configure
@@ -196,6 +196,7 @@ int test ( void )
 }' -lpthread
 
 check_cc_snippet qsort_r '
+#define __USE_GNU
 #include <stdlib.h>
 #define TEST test
 int test(void)
diff --git a/rpm/Makefile b/rpm/Makefile
index b187d2a13..d9396fc14 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -56,6 +56,15 @@ build: ~/rpmbuild/SOURCES tvheadend.spec
 	spectool --get-files --sourcedir tvheadend.spec
 	rpmbuild -ba tvheadend.spec
 
+.PHONY: build-doozer
+build-doozer: build
+	@for a in /project//rpmbuild/RPMS/$$(uname -m)/tvheadend-$(VERSION)-$(RELEASE)*.rpm \
+	          /project//rpmbuild/RPMS/$$(uname -m)/tvheadend-debuginfo-$(VERSION)-$(RELEASE)*.rpm; do \
+		name=$$(basename $$a); \
+		echo "doozer-versioned-artifact:$$a:rpm:application/x-rpm:$$name"; \
+	 done
+	
+
 .PHONY: clean.
 clean:
 	rm -f tvheadend.spec