Changeset 955c1c1 in rtems-source-builder


Ignore:
Timestamp:
May 8, 2020, 4:28:45 AM (6 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
5, master
Children:
da3505b
Parents:
0fd197f
git-author:
Chris Johns <chrisj@…> (05/08/20 04:28:45)
git-committer:
Chris Johns <chrisj@…> (05/08/20 04:33:44)
Message:

bare/qemu: Fixes building on FreeBSD

  • Move the qemu config to a common file shared by qemu and qemu4.
  • Disable nettle on qemu4, FreeBSd complained.
  • Add some extra git cleaning steps to the git path. These however do not full clean the qemu submodules and it is not worth the effort to try and fix.
  • The devel/qemu will not build on machines with python set to python3. This will not be fixed, use qemu4.

Closes #3966

Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • bare/config/bare-config.cfg

    r0fd197f r955c1c1  
    55#
    66# The RTEMS http git URL.
    7 #
    8 %define rtems_version         4.12
    97%define rtems_http_git        http://git.rtems.org
    108%define rtems_git_tools       %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version}
  • bare/config/devel/pixman-0.32.4-1.cfg

    r0fd197f r955c1c1  
    99%include %{_configdir}/base.cfg
    1010
    11 %define pixman_version 0.32.4
     11%define pixman_version 0.40.0
    1212%hash sha256 pixman-0.32.4.tar.gz 80c7ed420e8a3ae749800241e6347c3d55681296cab71384be7969cd9e657e84
    1313
  • bare/config/devel/qemu-git-1.cfg

    r0fd197f r955c1c1  
    2424 %source set qemu %{rtems_release_url}/%{rtems_version}/sources/qemu-git-42d58e7.tar.xz
    2525%else
    26  %source set qemu git://git.qemu-project.org/qemu.git?pull?checkout=%{qemu_version}?submodule=dtc
     26 %source set qemu git://git.qemu-project.org/qemu.git?clean=force?pull?checkout=%{qemu_version}?submodule=dtc
    2727%endif
    2828
  • source-builder/config/qemu-1-1.cfg

    r0fd197f r955c1c1  
    55#
    66
    7 %if %{release} == %{nil}
    8 %define release 1
    9 %endif
     7%define qemu_disables --disable-smartcard-nss
    108
    11 #
    12 # Select Snapshot Macro Maps
    13 #
    14 %select qemu-snapshot
    15 
    16 #
    17 # The description.
    18 #
    19 Name:      qemu-%{qemu_version}-%{_host}-%{release}
    20 Summary:   Qemu is a simulator of various processors.
    21 Version:   %{qemu_version}
    22 Release:   %{release}
    23 URL:       http://www.qemu.org/
    24 
    25 #
    26 # Source
    27 #
    28 %source set qemu http://wiki.qemu-project.org/download/qemu-%{qemu_version}.tar.bz2
    29 
    30 
    31 #
    32 # QEMU Disable component list.
    33 #
    34 # We are not interested in the VM use case for qemu and most of that
    35 # functionality carries host platform baggage which complicates building on a
    36 # range of host platforms.
    37 #
    38 # You can specialise before including this config file.
    39 #
    40 #
    41 %define qemu_std_disables --disable-werror
    42 %define qemu_std_disables %{qemu_std_disables} --disable-smartcard-nss
    43 %define qemu_std_disables %{qemu_std_disables} --disable-tools
    44 %define qemu_std_disables %{qemu_std_disables} --disable-pie
    45 %define qemu_std_disables %{qemu_std_disables} --disable-vnc
    46 %define qemu_std_disables %{qemu_std_disables} --disable-sdl
    47 %define qemu_std_disables %{qemu_std_disables} --disable-gtk
    48 %define qemu_std_disables %{qemu_std_disables} --disable-opengl
    49 %define qemu_std_disables %{qemu_std_disables} --disable-netmap
    50 %ifn %{defined qemu_disables}
    51  %define qemu_disables %{nil}
    52 %endif
    53 %define qemu_disables %{qemu_std_disables} %{qemu_disables}
    54 
    55 #
    56 # QEMU Targets to build.
    57 #
    58 %if %{!defined qemu_archs} && %{!defined with_qemu_archs}
    59  %define qemu_target_list %{nil}
    60 %else
    61  %if %{defined with_qemu_archs}
    62   %define qemu_target_list --target-list=%{with_qemu_archs}
    63  %else
    64   %define qemu_target_list --target-list=%{qemu_archs}
    65  %endif
    66 %endif
    67 
    68 #
    69 # Prepare the source code.
    70 #
    71 %prep
    72   build_top=$(pwd)
    73 
    74   source_dir_qemu="qemu-%{qemu_version}"
    75   %source setup qemu -q -n qemu-%{qemu_version}
    76   %patch setup qemu -p1
    77 
    78   cd ${build_top}
    79 
    80 %build
    81   build_top=$(pwd)
    82 
    83   %{build_directory}
    84 
    85   mkdir -p ${build_dir}
    86   cd ${build_dir}
    87 
    88   %if %{pkgconfig check vdeplug}
    89     VDE_CONFIG="--enable-vde"
    90     VDE_CFLAGS="%{pkgconfig cflags vdeplug}"
    91     VDE_LDFLAGS="%{pkgconfig ldflags vdeplug} %{pkgconfig libs vdeplug}"
    92   %endif
    93 
    94   %{host_build_flags}
    95 
    96   if test "%{_build}" != "%{_host}" ; then
    97     CROSS_PREFIX_OPTION="--cross-prefix=%{_host}-"
    98   fi
    99 
    100   SYSROOT=$SB_TMPPREFIX
    101 
    102   #
    103   # The --extra-cflags and --extra-ldflags do not work as expected.
    104   #
    105   # Hack warning: MSYS2 does not seem to convert the path to
    106   #               a shell path from Windows so we keep them
    107   #               separate and handle it in the pkgconfig tool.
    108   #
    109   PKG_CONFIG_DEFAULT_PATH=${PKG_CONFIG_PATH} \
    110   PKG_CONFIG_PATH=$SYSROOT/lib/pkgconfig \
    111   PKG_CONFIG_BUILD_TOP_DIR=$SB_TMPROOT \
    112   %{_ld_library_path}=$SYSROOT/lib \
    113   LDFLAGS="-Wl,-rpath -Wl,/$SB_PREFIX_CLEAN/lib -L$SYSROOT/lib ${VDE_LDFLAGS}" \
    114   CFLAGS="${CFLAGS} ${VDE_CFLAGS}" \
    115   ../${source_dir_qemu}/configure \
    116     --prefix=%{_prefix} \
    117     ${CROSS_PREFIX_OPTION} \
    118     --make=%{__make} \
    119     %{qemu_target_list} \
    120     ${VDE_CONFIG} \
    121     %{qemu_disables}
    122 
    123   %{_ld_library_path}=$SYSROOT/lib \
    124   %{__make} %{?_smp_mflags} all
    125 
    126   cd ${build_top}
    127 
    128 %install
    129   build_top=$(pwd)
    130 
    131   %{__rmdir} $SB_BUILD_ROOT
    132 
    133   cd ${build_dir}
    134   %{_ld_library_path}=$SYSROOT/lib \
    135   %{__make} DESTDIR=$SB_BUILD_ROOT install
    136   cd ${build_top}
     9%include %{_configdir}/qemu-common-1.cfg
  • source-builder/config/qemu-4-1.cfg

    r0fd197f r955c1c1  
    55#
    66
    7 %if %{release} == %{nil}
    8 %define release 1
    9 %endif
     7%define qemu_disables --disable-nettle
    108
    11 #
    12 # Select Snapshot Macro Maps
    13 #
    14 %select qemu-snapshot
    15 
    16 #
    17 # The description.
    18 #
    19 Name:      qemu-%{qemu_version}-%{_host}-%{release}
    20 Summary:   Qemu is a simulator of various processors.
    21 Version:   %{qemu_version}
    22 Release:   %{release}
    23 URL:       http://www.qemu.org/
    24 
    25 #
    26 # Source
    27 #
    28 %source set qemu http://wiki.qemu-project.org/download/qemu-%{qemu_version}.tar.bz2
    29 
    30 
    31 #
    32 # QEMU Disable component list.
    33 #
    34 # We are not interested in the VM use case for qemu and most of that
    35 # functionality carries host platform baggage which complicates building on a
    36 # range of host platforms.
    37 #
    38 # You can specialise before including this config file.
    39 #
    40 #
    41 %define qemu_std_disables --disable-werror
    42 %define qemu_std_disables %{qemu_std_disables} --disable-tools
    43 %define qemu_std_disables %{qemu_std_disables} --disable-pie
    44 %define qemu_std_disables %{qemu_std_disables} --disable-vnc
    45 %define qemu_std_disables %{qemu_std_disables} --disable-sdl
    46 %define qemu_std_disables %{qemu_std_disables} --disable-gtk
    47 %define qemu_std_disables %{qemu_std_disables} --disable-opengl
    48 %define qemu_std_disables %{qemu_std_disables} --disable-netmap
    49 %ifn %{defined qemu_disables}
    50  %define qemu_disables %{nil}
    51 %endif
    52 %define qemu_disables %{qemu_std_disables} %{qemu_disables}
    53 
    54 #
    55 # QEMU Targets to build.
    56 #
    57 %if %{!defined qemu_archs} && %{!defined with_qemu_archs}
    58  %define qemu_target_list %{nil}
    59 %else
    60  %if %{defined with_qemu_archs}
    61   %define qemu_target_list --target-list=%{with_qemu_archs}
    62  %else
    63   %define qemu_target_list --target-list=%{qemu_archs}
    64  %endif
    65 %endif
    66 
    67 #
    68 # Prepare the source code.
    69 #
    70 %prep
    71   build_top=$(pwd)
    72 
    73   source_dir_qemu="qemu-%{qemu_version}"
    74   %source setup qemu -q -n qemu-%{qemu_version}
    75   %patch setup qemu -p1
    76 
    77   cd ${build_top}
    78 
    79 %build
    80   build_top=$(pwd)
    81 
    82   %{build_directory}
    83 
    84   mkdir -p ${build_dir}
    85   cd ${build_dir}
    86 
    87   %if %{pkgconfig check vdeplug}
    88     VDE_CONFIG="--enable-vde"
    89     VDE_CFLAGS="%{pkgconfig cflags vdeplug}"
    90     VDE_LDFLAGS="%{pkgconfig ldflags vdeplug} %{pkgconfig libs vdeplug}"
    91   %endif
    92 
    93   %{host_build_flags}
    94 
    95   if test "%{_build}" != "%{_host}" ; then
    96     CROSS_PREFIX_OPTION="--cross-prefix=%{_host}-"
    97   fi
    98 
    99   SYSROOT=$SB_TMPPREFIX
    100 
    101   #
    102   # The --extra-cflags and --extra-ldflags do not work as expected.
    103   #
    104   # Hack warning: MSYS2 does not seem to convert the path to
    105   #               a shell path from Windows so we keep them
    106   #               separate and handle it in the pkgconfig tool.
    107   #
    108   PKG_CONFIG_DEFAULT_PATH=${PKG_CONFIG_PATH} \
    109   PKG_CONFIG_PATH=$SYSROOT/lib/pkgconfig \
    110   PKG_CONFIG_BUILD_TOP_DIR=$SB_TMPROOT \
    111   %{_ld_library_path}=$SYSROOT/lib \
    112   LDFLAGS="-Wl,-rpath -Wl,/$SB_PREFIX_CLEAN/lib -L$SYSROOT/lib ${VDE_LDFLAGS}" \
    113   CFLAGS="${CFLAGS} ${VDE_CFLAGS}" \
    114   ../${source_dir_qemu}/configure \
    115     --prefix=%{_prefix} \
    116     ${CROSS_PREFIX_OPTION} \
    117     --make=%{__make} \
    118     %{qemu_target_list} \
    119     ${VDE_CONFIG} \
    120     %{qemu_disables}
    121 
    122   %{_ld_library_path}=$SYSROOT/lib \
    123   %{__make} %{?_smp_mflags} all
    124 
    125   cd ${build_top}
    126 
    127 %install
    128   build_top=$(pwd)
    129 
    130   %{__rmdir} $SB_BUILD_ROOT
    131 
    132   cd ${build_dir}
    133   %{_ld_library_path}=$SYSROOT/lib \
    134   %{__make} DESTDIR=$SB_BUILD_ROOT install
    135   cd ${build_top}
     9%include %{_configdir}/qemu-common-1.cfg
Note: See TracChangeset for help on using the changeset viewer.