doozer: add fedora24-x86_64 and centos7-x86_64 targets

diff --git a/.doozer.json b/.doozer.json
index b8fca0614a242ed0b07f2d730585501b09cdb260..95a0f35b3af33b89e1af3a0f65aa4fba4a05b4bb 100644 (file)
--- 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 3b8b12420db8acfbe6219c3e73f49a7c89038c33..3a266ed7be7e3df10c13cced40d498d41d59549e 100755 (executable)
--- 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 b187d2a139c490bd9a558c5e36478c84d6cf2c34..d9396fc14a84739b048fd5323c773354e0dc779c 100644 (file)
--- 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