[VirtualBox] Enable GCC 8 support Use pkgconfig to get include/libs instead of hardcoding

commit 4961a90f9c89364763a43c83fc89b208f9e2436b Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Feb 3 07:24:19 2018 +0000 Enable GCC 8 support Use pkgconfig to get include/libs instead of hardcoding VirtualBox-gcc.patch | 20 +++++++++++--------- VirtualBox.spec | 19 ++++++++++++------- update_vbox.sh | 6 +++--- 3 files changed, 26 insertions(+), 19 deletions(-) --- diff --git a/VirtualBox-gcc.patch b/VirtualBox-gcc.patch index 7d896ef..fe837b2 100644 --- a/VirtualBox-gcc.patch +++ b/VirtualBox-gcc.patch @@ -1,11 +1,13 @@ ---- ./configure.orig 2017-03-08 23:58:22.033228287 +0000 -+++ ./configure 2017-03-08 23:58:27.288283387 +0000 -@@ -447,7 +447,7 @@ check_gcc() - -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \ - -o \( $cc_maj -eq 5 -a $cc_min -gt 9 \) \ - -o \( $cc_maj -eq 6 -a $cc_min -gt 9 \) \ -- -o $cc_maj -gt 6 ]; then -+ -o $cc_maj -gt 7 ]; then - log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x, gcc 5.x or gcc 6.x" +--- ./configure.orig 2018-01-15 14:49:37.000000000 +0000 ++++ ./configure 2018-02-03 07:14:08.669272715 +0000 +@@ -440,8 +440,8 @@ check_gcc() + elif [ $cc_maj -lt 4 \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) \ +- -o $cc_maj -gt 7 ]; then +- log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x...7.x" ++ -o $cc_maj -gt 8 ]; then ++ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x...8.x" fail really else + log_success "found version $cc_ver" diff --git a/VirtualBox.spec b/VirtualBox.spec index 15a59ca..b79e2cc 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -272,7 +272,7 @@ rm -r src/libs/zlib-1.2.8/ %patch24 -p1 -b .xserver_guest_xorg19 %endif #patch26 -p1 -b .nobundles -#patch27 -p1 -b .gcc +%patch27 -p1 -b .gcc %if 0%{?fedora} > 20 %patch28 -p1 -b .gsoap2 %endif @@ -325,10 +325,10 @@ kmk %{_smp_mflags} \ VBOX_USE_SYSTEM_XORG_HEADERS=1 \ VBOX_USE_SYSTEM_GL_HEADERS=1 \ VBOX_NO_LEGACY_XORG_X11=1 \ - SDK_VBOX_LIBPNG_INCS=/usr/include/libpng16 \ - SDK_VBOX_LIBXML2_INCS=/usr/include/libxml2 \ - SDK_VBOX_OPENSSL_INCS= \ - SDK_VBOX_OPENSSL_LIBS="ssl crypto" \ + SDK_VBOX_LIBPNG_INCS="$(pkgconf --cflags libpng)" \ + SDK_VBOX_LIBXML2_INCS="$(pkgconf --cflags libxml-2.0)" \ + SDK_VBOX_OPENSSL_INCS="$(pkgconf --cflags openssl)" \ + SDK_VBOX_OPENSSL_LIBS="$(pkgconf --libs openssl)" \ SDK_VBOX_ZLIB_INCS= \ %if %{with docs} @@ -768,7 +768,11 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog -* Fri Feb 02 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 5.2.6-3 +* Sat Feb 03 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.6-3 +- Enable GCC 8 support +- Use pkgconfig to get include/libs instead of hardcoding + +* Fri Feb 02 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - Rebuild for boost-1.66 * Fri Jan 19 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.6-2 @@ -801,7 +805,8 @@ getent passwd vboxadd >/dev/null || \ * Sun Aug 06 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.26-2 - Some improvements based on new virtualbox-guest-additions for Fedora rhbz #1481630 and rfbz #4617 -- VMSVGA3D from Config.kmk is windows only +- Drop VirtualBox-4.3.0-no-bundles.patch, set make variables instead +- Remove VMSVGA3D from Config.kmk is windows only - VBOX_WITH_EXTPACK_VBOXDTRACE fails to build with glibc >= 2.26-2.fc27 * Thu Jul 27 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.26-1 diff --git a/update_vbox.sh b/update_vbox.sh index 0a036ee..575ec04 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,10 +1,10 @@ VERSION=5.2.6 -REL=1 +REL=2 git pull rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox.spec spectool -g VirtualBox.spec rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 -rfpkg clog && rfpkg commit -F clog && /bin/rm clog && git show +rfpkg ci -c && git show echo Press enter to continue; read dummy; rfpkg push && rfpkg build --nowait echo Press enter to continue; read dummy; @@ -19,7 +19,7 @@ git checkout el7 && git merge master && git push && rfpkg build --nowait; git ch cd ../VirtualBox-kmod/ git pull rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox-kmod.spec -rfpkg clog && rfpkg commit -F clog && /bin/rm clog && git show +rfpkg ci -c && git show #cp VirtualBox-kmod.spec VirtualBox-kmod.spec.new #git reset HEAD~1 #git rm kernel-4.10.0-0.rc5.lnkops.v2.patch