Hello community, here is the log from the commit of package klee-uclibc for openSUSE:Factory checked in at 2020-09-24 16:14:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klee-uclibc (Old) and /work/SRC/openSUSE:Factory/.klee-uclibc.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "klee-uclibc" Thu Sep 24 16:14:54 2020 rev:15 rq:836442 version:1.0.0+git.20200711 Changes: -------- --- /work/SRC/openSUSE:Factory/klee-uclibc/klee-uclibc.changes 2020-04-28 22:30:07.529502446 +0200 +++ /work/SRC/openSUSE:Factory/.klee-uclibc.new.4249/klee-uclibc.changes 2020-09-24 16:15:17.696961685 +0200 @@ -1,0 +2,7 @@ +Thu Sep 24 05:31:55 UTC 2020 - jsl...@suse.com + +- Update to version 1.0.0+git.20200711: + * Correcting use of 'lookForNew' and some rudimentary code tidying in 'configure' +- disable x86_32 as it is unsupported -- there are bugs in klee. + +------------------------------------------------------------------- Old: ---- klee-uclibc-1.0.0+git.20190816.tar.xz New: ---- klee-uclibc-1.0.0+git.20200711.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klee-uclibc.spec ++++++ --- /var/tmp/diff_new_pack.jtaCm7/_old 2020-09-24 16:15:19.428963417 +0200 +++ /var/tmp/diff_new_pack.jtaCm7/_new 2020-09-24 16:15:19.432963421 +0200 @@ -18,13 +18,13 @@ %define llvm_version 10 -%define version_unconverted 1.0.0+git.20190816 +%define version_unconverted 1.0.0+git.20200711 Name: klee-uclibc Summary: Libc library for Klee License: LGPL-2.1-or-later Group: Development/Languages/Other -Version: 1.0.0+git.20190816 +Version: 1.0.0+git.20200711 Release: 0 URL: https://github.com/klee/klee-uclibc Source0: %{name}-%{version}.tar.xz @@ -37,7 +37,7 @@ BuildRequires: ncurses-devel BuildRequires: python-base BuildRequires: xz -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: x86_64 %description This is a port of uClibc to LLVM to serve Klee. Hence, this package @@ -73,7 +73,6 @@ install -m 0644 lib/libc.a %{buildroot}%{_libdir}/%{name}/lib/ %files devel-static -%defattr(-,root,root) %doc README README.md TODO %license COPYING.LIB %dir %{_libdir}/%{name}/ ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.jtaCm7/_old 2020-09-24 16:15:19.488963477 +0200 +++ /var/tmp/diff_new_pack.jtaCm7/_new 2020-09-24 16:15:19.488963477 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/klee/klee-uclibc.git</param> - <param name="changesrevision">95bff341a1df58020a39b6f99cc29f6babe4dc67</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">2a20e06561cb7f001883d06420185de0367126dd</param></service></servicedata> \ No newline at end of file ++++++ klee-uclibc-1.0.0+git.20190816.tar.xz -> klee-uclibc-1.0.0+git.20200711.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klee-uclibc-1.0.0+git.20190816/.travis/install-llvm-and-runtime-compiler.sh new/klee-uclibc-1.0.0+git.20200711/.travis/install-llvm-and-runtime-compiler.sh --- old/klee-uclibc-1.0.0+git.20190816/.travis/install-llvm-and-runtime-compiler.sh 2019-08-16 17:40:54.000000000 +0200 +++ new/klee-uclibc-1.0.0+git.20200711/.travis/install-llvm-and-runtime-compiler.sh 2020-07-11 19:03:50.000000000 +0200 @@ -1,23 +1,7 @@ #!/bin/bash -x set -ev -# Install newer compiler to support C++11 -sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test -sudo apt-get -qq update -sudo apt-get -qq install g++-5 -sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 50 -sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 50 - -export CC=gcc-5 -export CXX=g++-5 - sudo apt-get install -y llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev - -if [ "${LLVM_VERSION}" == "3.4" ]; then - sudo apt-get install -y llvm-${LLVM_VERSION}-tools clang-${LLVM_VERSION} - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 20 - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 20 -else - echo "Unknown LLVM version ${LLVM_VERSION}" - exit 1 -fi +sudo apt-get install -y clang-${LLVM_VERSION} llvm-${LLVM_VERSION}-tools +sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 20 +sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klee-uclibc-1.0.0+git.20190816/.travis/klee.sh new/klee-uclibc-1.0.0+git.20200711/.travis/klee.sh --- old/klee-uclibc-1.0.0+git.20190816/.travis/klee.sh 2019-08-16 17:40:54.000000000 +0200 +++ new/klee-uclibc-1.0.0+git.20200711/.travis/klee.sh 2020-07-11 19:03:50.000000000 +0200 @@ -1,16 +1,10 @@ #!/bin/bash -x # Make sure we exit if there is a failure set -e -: ${SOLVERS?"Solvers must be specified"} source ${SRC_DIR}/.travis/llvm_compiler.sh ############################################################################### -# Clone KLEE source code -############################################################################### -git clone https://github.com/klee/klee.git ${SRC_DIR}/klee - -############################################################################### # Testing utils for KLEE ############################################################################### source ${SRC_DIR}/.travis/testing-utils.sh @@ -18,30 +12,23 @@ cd ${BUILD_DIR} ############################################################################### -# Setting up solvers for KLEE +# Build STP ############################################################################### -source ${SRC_DIR}/.travis/solvers.sh -KLEE_Z3_CONFIGURE_OPTION="" -SOLVER_LIST=$(echo "${SOLVERS}" | sed 's/:/ /') - -# Set CMake configure options -for solver in ${SOLVER_LIST}; do - echo "Setting CMake configuration option for ${solver}" - case ${solver} in - Z3) - echo "Z3" - KLEE_Z3_CONFIGURE_OPTION="-DENABLE_SOLVER_Z3=TRUE" - ;; - *) - echo "Unknown solver ${solver}" - exit 1 - esac -done +git clone https://github.com/stp/stp.git +cd stp +git checkout tags/2.3.3 +mkdir build +cd build +cmake .. +make +sudo make install ############################################################################### -# Compile KLEE and run tests +# Build KLEE and run tests ############################################################################### +git clone https://github.com/klee/klee.git ${SRC_DIR}/klee + mkdir klee-build cd klee-build @@ -66,7 +53,7 @@ -DLLVMCC="${KLEE_CC}" \ -DLLVMCXX="${KLEE_CXX}" \ -DENABLE_TCMALLOC=OFF \ - ${KLEE_Z3_CONFIGURE_OPTION} \ + -DENABLE_SOLVER_STP=ON \ ${KLEE_UCLIBC_CONFIGURE_OPTION} \ -DGTEST_SRC_DIR=${GTEST_SRC_DIR} \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ @@ -85,4 +72,5 @@ ############################################################################### # lit tests ############################################################################### +pip install tabulate make systemtests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klee-uclibc-1.0.0+git.20190816/.travis/llvm_compiler.sh new/klee-uclibc-1.0.0+git.20200711/.travis/llvm_compiler.sh --- old/klee-uclibc-1.0.0+git.20190816/.travis/llvm_compiler.sh 2019-08-16 17:40:54.000000000 +0200 +++ new/klee-uclibc-1.0.0+git.20200711/.travis/llvm_compiler.sh 2020-07-11 19:03:50.000000000 +0200 @@ -7,10 +7,5 @@ ############################################################################### # Select the compiler to use to generate LLVM bitcode ############################################################################### -if [ "${LLVM_VERSION}" != "2.9" ]; then - KLEE_CC=/usr/bin/clang-${LLVM_VERSION} - KLEE_CXX=/usr/bin/clang++-${LLVM_VERSION} -else - echo "Unknown LLVM version ${LLVM_VERSION}" - exit 1 -fi +KLEE_CC=/usr/bin/clang-${LLVM_VERSION} +KLEE_CXX=/usr/bin/clang++-${LLVM_VERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klee-uclibc-1.0.0+git.20190816/.travis/testing-utils.sh new/klee-uclibc-1.0.0+git.20200711/.travis/testing-utils.sh --- old/klee-uclibc-1.0.0+git.20190816/.travis/testing-utils.sh 2019-08-16 17:40:54.000000000 +0200 +++ new/klee-uclibc-1.0.0+git.20200711/.travis/testing-utils.sh 2020-07-11 19:03:50.000000000 +0200 @@ -2,6 +2,11 @@ # Make sure we exit if there is a failure set -e +# Install lit and tabulate +pip3 install lit +pip3 install tabulate + + mkdir ${BUILD_DIR}/test-utils/ cd ${BUILD_DIR}/test-utils/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klee-uclibc-1.0.0+git.20190816/.travis.yml new/klee-uclibc-1.0.0+git.20200711/.travis.yml --- old/klee-uclibc-1.0.0+git.20190816/.travis.yml 2019-08-16 17:40:54.000000000 +0200 +++ new/klee-uclibc-1.0.0+git.20200711/.travis.yml 2020-07-11 19:03:50.000000000 +0200 @@ -1,5 +1,5 @@ -sudo: required -dist: trusty +os: linux +dist: bionic language: cpp compiler: # FIXME: For now, building with Clang is disabled because the STP built with @@ -8,7 +8,6 @@ # but for now it is easier to just reduce the number of configs we test # anyway. # - clang - - gcc env: ########################################################################### @@ -20,35 +19,37 @@ ########################################################################### # Check a subset of the matrix of: - # LLVM : {3.4} - # SOLVERS : {Z3} + # LLVM : {9} + # SOLVERS : {STP} # DISABLE_ASSERTIONS: {0} # ENABLE_OPTIMIZED: {1} # Check KLEE CMake build - - LLVM_VERSION=3.4 SOLVERS=Z3 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 + - LLVM_VERSION=9 SOLVERS=STP DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 addons: apt: sources: - sourceline: 'ppa:ubuntu-toolchain-r/test' - - sourceline: 'ppa:h-rayflood/llvm' - - sourceline: 'deb http://download.opensuse.org/repositories/home:/delcypher:/z3/xUbuntu_14.04/ /' - key_url: 'http://download.opensuse.org/repositories/home:delcypher:z3/xUbuntu_14.04/Release.key' packages: - - gcc-4.8 - - g++-4.8 + - gcc-7 + - g++-7 - libcap-dev - libselinux1-dev - cmake + - libsqlite3-dev + - bison + - flex + - libboost-all-dev + - python3 + - python3-setuptools + - python3-pip + - perl + - zlib1g-dev + - minisat cache: apt before_install: - ########################################################################### - # Set up the locations to get various packages from - # We assume the Travis image uses Ubuntu 14.04 LTS - ########################################################################### - # Update package information - sudo apt-get update ########################################################################### # Set up out of source build directory @@ -63,8 +64,6 @@ ########################################################################### # Install LLVM and the LLVM bitcode compiler we require to build KLEE - ${SRC_DIR}/.travis/install-llvm-and-runtime-compiler.sh - # Install lit (llvm-lit is not available) - - sudo pip install lit==0.6.0 script: # Build uclibc - ${SRC_DIR}/.travis/uclibc.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klee-uclibc-1.0.0+git.20190816/configure new/klee-uclibc-1.0.0+git.20200711/configure --- old/klee-uclibc-1.0.0+git.20190816/configure 2019-08-16 17:40:54.000000000 +0200 +++ new/klee-uclibc-1.0.0+git.20200711/configure 2020-07-11 19:03:50.000000000 +0200 @@ -103,7 +103,7 @@ else: # Search for tool in PATH ccAbs = getAbsPathForToolInPathEnv(cc) - if ccAbs == None: + if ccAbs is None: logging.error('"{0}" is not in your path.'.format(cc)) sys.exit(1) else: @@ -208,8 +208,8 @@ if r[0] == 0: # decode needed for Python 3.x as we get bytes not str return r[1].replace('\n','').lstrip().rstrip() - else: - return None + + return None @@ -272,9 +272,9 @@ if cc.endswith('llvm-gcc'): logging.warning('Not using llvm-gcc to build host code.') return 'cc' # This probably user's native compiler - else: - # Other compilers are probably okay - return cc + + # Other compilers are probably okay + return cc def handleNativeConfig(pargs, cc=None): logging.info('Configuring for native archive') @@ -293,11 +293,11 @@ if ccNew: logging.info('Found...{}'.format(ccNew)) else: - logging.info('Could not find {}'.format(lookForNew)) + logging.info('Could not find {}'.format(lookFor)) return ccNew - else: - return cc + + return cc # Detect compiler if not forced @@ -308,7 +308,7 @@ # Test compiler #FIXME - if cc == None: + if cc is None: logging.error('Could not find a C compiler') sys.exit(1) @@ -360,7 +360,7 @@ logging.info('Using llvm-config at...{}'.format(llvmConfigTool)) - if llvmConfigTool == None: + if llvmConfigTool is None: logging.error('llvm-config cannot be found') sys.exit(1) @@ -427,7 +427,6 @@ doTemplate(subs, templateFile, templateTarget) def doTemplate(subs, src, dest): - import re """ Do a Template substitution using @KEY@ syntax. @@ -522,7 +521,6 @@ if bitCodeFileName and os.path.exists(bitCodeFileName): os.remove(bitCodeFileName) if cProgramFileName and os.path.exists(cProgramFileName): os.remove(cProgramFileName) if llvmAsFileName and os.path.exists(llvmAsFileName): os.remove(llvmAsFileName) - pass try: with tempfile.NamedTemporaryFile(suffix='.bc', delete=False) as f: @@ -579,7 +577,7 @@ cleanUp() return False - except Exception as e: + except Exception: cleanUp() raise @@ -623,5 +621,6 @@ logging.error('You should install the ncurses library and development headers.') return False + if __name__ == '__main__': main(sys.argv[1:])
