Skip to contentSkip to conversation

configure: recognize more rpmbuild macros

PATCH Applied Olaf Hering 2 participants 5 messages Apr 18, 2018 – May 9, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configure: recognize more rpmbuild macros

Extend the list of recognized, but ignored options from rpms %configure macro. This fixes build on hosts running SUSE Linux.

---
 configure | 3 +++
 1 file changed, 3 insertions(+)
configure +3 -0
index 0a19b033bc..6e9b994f21 100755
@@ -959,6 +959,9 @@ for opt do
   ;;
   --firmwarepath=*) firmwarepath="$optarg"
   ;;
+  --host=*|--build=*|\
+  --program-prefix=*|--exec-prefix=*|\
+  --disable-dependency-tracking|\
   --sbindir=*|--sharedstatedir=*|\
   --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
   --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
#1 lore raw
Quoted 14 lines · Olaf Hering

Extend the list of recognized, but ignored options from rpms %configure macro. This fixes build on hosts running SUSE Linux.

---
 configure | 3 +++
 1 file changed, 3 insertions(+)
configure +0 -0
index 0a19b033bc..6e9b994f21 100755

configure for opt do · line 967

Quoted 9 lines
configure +3 -0
@@ -959,6 +959,9 @@ for opt do
   ;;
   --firmwarepath=*) firmwarepath="$optarg"
   ;;
+  --host=*|--build=*|\
+  --program-prefix=*|--exec-prefix=*|\
+  --disable-dependency-tracking|\
   --sbindir=*|--sharedstatedir=*|\
   --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
   --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)

Queued, thanks.

Paolo

#2 lore raw
Quoted 9 lines · Paolo Bonzini
Quoted 8 lines · Olaf Hering

Extend the list of recognized, but ignored options from rpms %configure macro. This fixes build on hosts running SUSE Linux.

---
 configure | 3 +++
 1 file changed, 3 insertions(+)
Quoted 11 lines

configure for opt do · line 964

Quoted 11 lines
configure +3 -0
index 0a19b033bc..6e9b994f21 100755
@@ -959,6 +959,9 @@ for opt do
   ;;
   --firmwarepath=*) firmwarepath="$optarg"
   ;;
+  --host=*|--build=*|\
+  --program-prefix=*|--exec-prefix=*|\
+  --disable-dependency-tracking|\

Actually, --program-prefix= and --exec-prefix= have a meaning, they cannot just be ignored. For now I've removed this line; what is the exact incantation used by SUSE Linux?

Thanks,

Paolo

Quoted 9 lines

configure for opt do · line 967

Quoted 4 lines
configure +0 -0
   --sbindir=*|--sharedstatedir=*|\
   --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
   --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)

Queued, thanks.

Paolo

#3 lore raw

Am Wed, 9 May 2018 00:15:42 +0200
schrieb Paolo Bonzini <[email protected]>:

Quoted 3 lines

Actually, --program-prefix= and --exec-prefix= have a meaning, they cannot just be ignored. For now I've removed this line; what is the exact incantation used by SUSE Linux?

Like in every other rpm.rpm I guess:

/usr/lib/rpm/macros:%_exec_prefix %{_prefix}
/usr/lib/rpm/macros: --program-prefix=%{?_program_prefix} \\\
/usr/lib/rpm/macros: --exec-prefix=%{_exec_prefix} \\\

Are you saying your %configure is different from my %configure? In any case, qemu has to tolerate both options.

Olaf

#4 lore raw
Quoted 7 lines · Olaf Hering

Am Wed, 9 May 2018 00:15:42 +0200
schrieb Paolo Bonzini <[email protected]>:

Quoted 3 lines

Actually, --program-prefix= and --exec-prefix= have a meaning, they cannot just be ignored. For now I've removed this line; what is the exact incantation used by SUSE Linux?

Quoted 8 lines

Like in every other rpm.rpm I guess:

/usr/lib/rpm/macros:%_exec_prefix %{_prefix}
/usr/lib/rpm/macros: --program-prefix=%{?_program_prefix} \\\
/usr/lib/rpm/macros: --exec-prefix=%{_exec_prefix} \\\

Are you saying your %configure is different from my %configure? In any case, qemu has to tolerate both options.

I agree that it's a worthwhile improvement but it also has to fail if use an argument other than the default (or implement them, which I'm probably not advising here). Otherwise packaging breaks if someone for whatever reason overrides the %_program_prefix and %_exec_prefix macros.

Paolo