Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/redhat-rpm-config.git#61b19ee1b2c610a77d6ae8df02262792384d83f0

brp-python-bytecompile

@@ -121,7 +121,7 @@ export PYTHONHASHSEED=0
 shopt -s nullglob
 for python_libdir in `find "$RPM_BUILD_ROOT" -type d|grep -E "/(usr|app)/lib(64)?/python[0-9]\.[0-9]+$"`;
 do
-	python_binary=/usr/bin/$(basename $python_libdir)
+	python_binary=$(basename $python_libdir)
 	real_libdir=${python_libdir/$RPM_BUILD_ROOT/}
 	echo "Bytecompiling .py files below $python_libdir using $python_binary"
 

gating.yaml

@@ -0,0 +1,12 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

redhat-rpm-config.spec

@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 180
+Version: 181
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -213,6 +213,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Wed Mar 10 2021 Kalev Lember <klember@redhat.com> - 181-1
+- BRP Python Bytecompile: Avoid hardcoding /usr/bin prefix for python
+
 * Tue Jan 19 2021 Florian Weimer <fweimer@redhat.com> - 180-1
 - Use -march=x86-64-v2 only for the gcc toolchain
 

tests/gcc-fedora-flags/hello.c

@@ -0,0 +1,5 @@
+#include <stdio.h>
+
+void hello() {
+  printf("Hello World\n");
+}

tests/gcc-fedora-flags/hello.cpp

@@ -0,0 +1,5 @@
+#include <iostream>
+
+void hello() {
+  std::cout << "Hello World\n";
+}

tests/gcc-fedora-flags/main.c

@@ -0,0 +1,6 @@
+void hello();
+
+int main(int argc, char **argv) {
+  hello();
+  return 0;
+}

tests/gcc-fedora-flags/main.cpp

@@ -0,0 +1,6 @@
+void hello();
+
+int main(int argc, char **argv) {
+  hello();
+  return 0;
+}

tests/gcc-fedora-flags/runtest.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -ex
+
+default_cflags=`rpm -E %{build_cflags}`
+default_cxxflags=`rpm -E %{build_cxxflags}`
+default_ldflags=`rpm -E %{build_ldflags}`
+
+cflags=`rpm -D '%toolchain gcc' -E %{build_cflags}`
+cxxflags=`rpm -D '%toolchain gcc' -E %{build_cxxflags}`
+ldflags=`rpm -D '%toolchain gcc' -E %{build_ldflags}`
+
+test "$default_cflags" = "$cflags"
+test "$default_cxxflags" = "$cxxflags"
+test "$default_ldflags" = "$ldflags"
+
+gcc $cflags -o hello.o -c hello.c
+annocheck hello.o
+gcc $cflags -o main.o -c main.c
+gcc $ldflags -o hello main.o hello.o
+annocheck hello
+./hello | grep "Hello World"
+
+g++ $cxxflags -o hello-cpp.o -c hello.cpp
+annocheck hello-cpp.o
+g++ $cxxflags -o main-cpp.o -c main.cpp
+g++ $ldflags -o hello-cpp main-cpp.o hello-cpp.o
+annocheck hello-cpp
+./hello-cpp | grep "Hello World"

tests/tests.yml

@@ -0,0 +1,19 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+      - classic
+    required_packages:
+      - rpm
+      # clang/fedora-flags
+      - clang
+      #gcc-fedora-flags
+      - gcc
+      - gcc-c++
+      - annobin-annocheck
+    repositories:
+      - repo: https://src.fedoraproject.org/tests/clang.git
+        dest: clang
+    tests:
+      - clang/fedora-flags
+      - gcc-fedora-flags