Changes between Version 1 and Version 2 of Ticket #18339, comment 1


Ignore:
Timestamp:
Apr 1, 2023, 10:27:00 PM (20 months ago)
Author:
kallisti5

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #18339, comment 1

    v1 v2  
    1111   29 | #cmakedefine LIBSOLV_FEATURE_COMPLEX_DEPS
    1212      |  ^~~~~~~~~~~
    13 objects/common/build/libsolv/solvversion.h:30:2: error: invalid preprocessing directive #cmakedefine
    14    30 | #cmakedefine LIBSOLV_FEATURE_MULTI_SEMANTICS
    15       |  ^~~~~~~~~~~
    16 objects/common/build/libsolv/solvversion.h:31:2: error: invalid preprocessing directive #cmakedefine
    17    31 | #cmakedefine LIBSOLV_FEATURE_CONDA
    18       |  ^~~~~~~~~~~
    19 objects/common/build/libsolv/solvversion.h:33:2: error: invalid preprocessing directive #cmakedefine
    20    33 | #cmakedefine LIBSOLVEXT_FEATURE_RPMPKG
    21       |  ^~~~~~~~~~~
    22 objects/common/build/libsolv/solvversion.h:34:2: error: invalid preprocessing directive #cmakedefine
    23    34 | #cmakedefine LIBSOLVEXT_FEATURE_RPMDB
    24       |  ^~~~~~~~~~~
    25 objects/common/build/libsolv/solvversion.h:35:2: error: invalid preprocessing directive #cmakedefine
    26    35 | #cmakedefine LIBSOLVEXT_FEATURE_RPMDB_BYRPMHEADER
    27       |  ^~~~~~~~~~~
    28 objects/common/build/libsolv/solvversion.h:36:2: error: invalid preprocessing directive #cmakedefine
    29    36 | #cmakedefine LIBSOLVEXT_FEATURE_PUBKEY
    30       |  ^~~~~~~~~~~
    31 objects/common/build/libsolv/solvversion.h:37:2: error: invalid preprocessing directive #cmakedefine
    32    37 | #cmakedefine LIBSOLVEXT_FEATURE_RPMMD
    33       |  ^~~~~~~~~~~
    34 objects/common/build/libsolv/solvversion.h:38:2: error: invalid preprocessing directive #cmakedefine
    35    38 | #cmakedefine LIBSOLVEXT_FEATURE_SUSEREPO
    36       |  ^~~~~~~~~~~
    37 objects/common/build/libsolv/solvversion.h:39:2: error: invalid preprocessing directive #cmakedefine
    38    39 | #cmakedefine LIBSOLVEXT_FEATURE_COMPS
    39       |  ^~~~~~~~~~~
    40 objects/common/build/libsolv/solvversion.h:40:2: error: invalid preprocessing directive #cmakedefine
    41    40 | #cmakedefine LIBSOLVEXT_FEATURE_HELIXREPO
    42       |  ^~~~~~~~~~~
    43 objects/common/build/libsolv/solvversion.h:41:2: error: invalid preprocessing directive #cmakedefine
    44    41 | #cmakedefine LIBSOLVEXT_FEATURE_DEBIAN
    45       |  ^~~~~~~~~~~
    46 objects/common/build/libsolv/solvversion.h:42:2: error: invalid preprocessing directive #cmakedefine
    47    42 | #cmakedefine LIBSOLVEXT_FEATURE_ARCHREPO
    48       |  ^~~~~~~~~~~
    49 objects/common/build/libsolv/solvversion.h:43:2: error: invalid preprocessing directive #cmakedefine
    50    43 | #cmakedefine LIBSOLVEXT_FEATURE_HAIKU
    51       |  ^~~~~~~~~~~
    52 objects/common/build/libsolv/solvversion.h:44:2: error: invalid preprocessing directive #cmakedefine
    53    44 | #cmakedefine LIBSOLVEXT_FEATURE_APPDATA
    54       |  ^~~~~~~~~~~
    55 objects/common/build/libsolv/solvversion.h:45:2: error: invalid preprocessing directive #cmakedefine
    56    45 | #cmakedefine LIBSOLVEXT_FEATURE_ZLIB_COMPRESSION
    57       |  ^~~~~~~~~~~
    58 objects/common/build/libsolv/solvversion.h:46:2: error: invalid preprocessing directive #cmakedefine
    59    46 | #cmakedefine LIBSOLVEXT_FEATURE_LZMA_COMPRESSION
    60       |  ^~~~~~~~~~~
    61 objects/common/build/libsolv/solvversion.h:47:2: error: invalid preprocessing directive #cmakedefine
    62    47 | #cmakedefine LIBSOLVEXT_FEATURE_BZIP2_COMPRESSION
    63       |  ^~~~~~~~~~~
    64 objects/common/build/libsolv/solvversion.h:48:2: error: invalid preprocessing directive #cmakedefine
    65    48 | #cmakedefine LIBSOLVEXT_FEATURE_ZSTD_COMPRESSION
    66       |  ^~~~~~~~~~~
    67 objects/common/build/libsolv/solvversion.h:49:2: error: invalid preprocessing directive #cmakedefine
    68    49 | #cmakedefine LIBSOLVEXT_FEATURE_ZCHUNK_COMPRESSION
    69       |  ^~~~~~~~~~~
     13.
     14.
     15}}}
    7016
     17These can be solved via:
     18{{{
     19diff --git a/src/build/libsolv/Jamfile b/src/build/libsolv/Jamfile
     20index 3cedcf7d79..27fe16af22 100644
     21--- a/src/build/libsolv/Jamfile
     22+++ b/src/build/libsolv/Jamfile
     23@@ -97,6 +97,8 @@ actions GenerateLibsolvVersionHeader
     24                -e s,@LIBSOLV_MAJOR@,$(LIBSOLV_MAJOR),g \
     25                -e s,@LIBSOLV_MINOR@,$(LIBSOLV_MINOR),g \
     26                -e s,@LIBSOLV_PATCH@,$(LIBSOLV_PATCH),g \
     27+               -e 's/#cmakedefine.*LIBSOLVEXT_FEATURE_HAIKU$/#define LIBSOLVEXT_FEATURE_HAIKU/' \
     28+               -e '/#cmakedefine/d' \
     29                $(2) > $(1)
     30 }
    7131}}}
     32
     33However,  "GenerateLibsolvVersionHeader" feels like an abomination in general. It seems to be fixing up libsolv_source packages for the build host.