From 342c955896ceac42b14ef29ee4a75c2d520e12fa Mon Sep 17 00:00:00 2001 From: Leon White Date: Mon, 30 Mar 2026 10:20:52 +0200 Subject: [PATCH] community/avro: upgrade to 1.12.1 --- community/avro/APKBUILD | 24 +- community/avro/gcc15-fix-st-anyargs.patch | 385 ---------------------- community/avro/no-werror-for-c++.patch | 12 +- community/avro/nostatic.patch | 51 +-- community/avro/pkgconf.patch | 2 +- community/avro/version-bash.patch | 2 +- 6 files changed, 21 insertions(+), 455 deletions(-) delete mode 100644 community/avro/gcc15-fix-st-anyargs.patch diff --git a/community/avro/APKBUILD b/community/avro/APKBUILD index df40e47d21c..2522a2cfa4c 100644 --- a/community/avro/APKBUILD +++ b/community/avro/APKBUILD @@ -1,7 +1,7 @@ # Contributor: nu # Maintainer: nu pkgname=avro -pkgver=1.11.5 +pkgver=1.12.1 pkgrel=0 pkgdesc="Avro, a data serialization system" url="https://avro.apache.org/docs/current/api/c/index.html" @@ -15,6 +15,7 @@ depends_dev=" makedepends=" $depends_dev cmake + fmt-dev samurai xz-dev zlib-dev @@ -30,22 +31,22 @@ source="https://archive.apache.org/dist/avro/avro-$pkgver/avro-src-$pkgver.tar.g pkgconf.patch version-bash.patch no-werror-for-c++.patch - gcc15-fix-st-anyargs.patch " builddir="$srcdir"/avro-src-$pkgver/lang build() { export CFLAGS="$CFLAGS -O2 -DNDEBUG -flto=auto -Wno-incompatible-pointer-types" - export CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -flto=auto -Wno-cpp" - cmake3.5 -B build-c -G Ninja -S c \ + export CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -fno-lto -Wno-cpp" + cmake -B build-c -G Ninja -S c \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=None \ -DTHREADSAFE=ON cmake --build build-c - cmake3.5 -B build-c++ -G Ninja -S c++ \ + cmake -B build-c++ -G Ninja -S c++ \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None + -DCMAKE_BUILD_TYPE=None \ + -DAVRO_BUILD_STATIC=OFF cmake --build build-c++ } @@ -72,10 +73,9 @@ libavrocpp() { } sha512sums=" -8b2f75aa778559678eadbae0ee423106151f60db6785e727459cc821e2bafe2ade722da7bc45a593a050c2f27caaedbfc20cb598ccd244d1d6026d105d2bcd19 avro-src-1.11.5.tar.gz -e875a3726507326dd80b59906623015aaab685400e9f9fb30f10a8e7e5713b02804b1b38da41649c1b79586b1db8856f1c659280d951c4e616e707fb970a3726 nostatic.patch -4ba46eab0cae4225e87a86fe5b9b7fd0bc0be842e573576d6e048c9adc4c7e1a21cc8eac759049e2f39fad6c076aab4306c1a4d0cd748acb34aae9b302234d24 pkgconf.patch -71153a9a0f8607e48b7cf6fa5e0d70bb11162ec0f1f721dbee7b753f237dbfad1df57c4cd8917a7dd1ef19750bf07e12b04fbfe3fc9cc8bc91a6ef875a7cc778 version-bash.patch -3fe8feaecf5cb43a7153ca6583756bd853454868266bf23cf11316f52dda0a03ae78d0ef8c79799f78df3c5e029806fd5459c58ae7524fdde9ffba4eea8ba088 no-werror-for-c++.patch -75cca8ff5fc9c8a20169ae58b8efc8ea9e78aa60d5ad068777aa76c60da58d024a8bbe51ef7f78cdecb211f9de69d44dc5a08c4b8b07fd0e4eebf9f5239aae20 gcc15-fix-st-anyargs.patch +0d86bfece0f12f8bc424e27e71e3e6b828c4280fa1a6d7dc7e0d58bff2351f2c1fd3ccb98c1291dfc6c67d9cb5a0bdb7bb9f36ba5bd6b26fa9545f358db42663 avro-src-1.12.1.tar.gz +725db787aabc5c08b4d5170cf1522cafb87fd8ea38ae7e4e2e55d69816df41f709c99efbb8d076d0276feb2328f0a502be157a310eb993e819ce39c9a91d26f6 nostatic.patch +d6220ddd6a24951709307288ad487206c7b29006e4d0445b93604f632519f6edc6120739a2cc0fc7ed1699fab4a16b452a3f37c48417d1e409260fe779c0e01c pkgconf.patch +a0f3016af729ad3b78fa2712a1fbdf8b80306e9825f9b3bc9637b30f4e2b8f305148ad99e375ddc4e2140466e4ac950ad8d109e2fd4e63a72e330074e0c3f427 version-bash.patch +570b38c46f392dcc26c75387889913acc2dfc6b4042c0e06e147ad018a9ec7794364383e95a92d53dc451aafebae03acecb383505ec9267427ae8481513874df no-werror-for-c++.patch " diff --git a/community/avro/gcc15-fix-st-anyargs.patch b/community/avro/gcc15-fix-st-anyargs.patch deleted file mode 100644 index f54f21831a4..00000000000 --- a/community/avro/gcc15-fix-st-anyargs.patch +++ /dev/null @@ -1,385 +0,0 @@ -Patch-Source: https://github.com/apache/avro/commit/03ea96b48f7e668abd9f3b33799635e4e50a526c ---- -From 03ea96b48f7e668abd9f3b33799635e4e50a526c Mon Sep 17 00:00:00 2001 -From: Sahil Kang -Date: Mon, 25 Mar 2024 04:41:41 -0700 -Subject: [PATCH] AVRO-3960: [C] Fix st ANYARGS warning (#2798) - -This removes the following warning: - - avro/lang/c/src/st.c:240:13: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not - supported in C2x [-Wdeprecated-non-prototype] - hash_val = do_hash(key, table); - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang ---- - lang/c/src/datum.c | 12 ++++++------ - lang/c/src/datum_equal.c | 4 ++-- - lang/c/src/datum_size.c | 2 +- - lang/c/src/datum_validate.c | 2 +- - lang/c/src/memoize.c | 6 +++--- - lang/c/src/schema.c | 10 +++++----- - lang/c/src/st.c | 34 ++++++++++++++++++---------------- - lang/c/src/st.h | 22 +++++++++------------- - 8 files changed, 45 insertions(+), 47 deletions(-) - -diff --git a/c/src/datum.c b/c/src/datum.c -index 53dfa5ca067..5307c7a8385 100644 ---- a/c/src/datum.c -+++ b/c/src/datum.c -@@ -1095,7 +1095,7 @@ static void avro_datum_free(avro_datum_t datum) - record = avro_datum_to_record(datum); - avro_schema_decref(record->schema); - st_foreach(record->fields_byname, -- HASH_FUNCTION_CAST char_datum_free_foreach, 0); -+ (hash_function_foreach) char_datum_free_foreach, 0); - st_free_table(record->field_order); - st_free_table(record->fields_byname); - avro_freet(struct avro_record_datum_t, record); -@@ -1123,7 +1123,7 @@ static void avro_datum_free(avro_datum_t datum) - struct avro_map_datum_t *map; - map = avro_datum_to_map(datum); - avro_schema_decref(map->schema); -- st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach, -+ st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach, - 0); - st_free_table(map->map); - st_free_table(map->indices_by_key); -@@ -1135,7 +1135,7 @@ static void avro_datum_free(avro_datum_t datum) - struct avro_array_datum_t *array; - array = avro_datum_to_array(datum); - avro_schema_decref(array->schema); -- st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0); -+ st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0); - st_free_table(array->els); - avro_freet(struct avro_array_datum_t, array); - } -@@ -1183,7 +1183,7 @@ avro_datum_reset(avro_datum_t datum) - { - struct avro_array_datum_t *array; - array = avro_datum_to_array(datum); -- st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0); -+ st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0); - st_free_table(array->els); - - rval = avro_init_array(array); -@@ -1198,7 +1198,7 @@ avro_datum_reset(avro_datum_t datum) - { - struct avro_map_datum_t *map; - map = avro_datum_to_map(datum); -- st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach, 0); -+ st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach, 0); - st_free_table(map->map); - st_free_table(map->indices_by_key); - st_free_table(map->keys_by_index); -@@ -1217,7 +1217,7 @@ avro_datum_reset(avro_datum_t datum) - record = avro_datum_to_record(datum); - rval = 0; - st_foreach(record->fields_byname, -- HASH_FUNCTION_CAST datum_reset_foreach, (st_data_t) &rval); -+ (hash_function_foreach) datum_reset_foreach, (st_data_t) &rval); - return rval; - } - -diff --git a/c/src/datum_equal.c b/c/src/datum_equal.c -index 3875bea048d..7e7c9b94099 100644 ---- a/c/src/datum_equal.c -+++ b/c/src/datum_equal.c -@@ -78,7 +78,7 @@ static int map_equal(struct avro_map_datum_t *a, struct avro_map_datum_t *b) - if (a->map->num_entries != b->map->num_entries) { - return 0; - } -- st_foreach(a->map, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args); -+ st_foreach(a->map, (hash_function_foreach) st_equal_foreach, (st_data_t) & args); - return args.rval; - } - -@@ -93,7 +93,7 @@ static int record_equal(struct avro_record_datum_t *a, - if (a->fields_byname->num_entries != b->fields_byname->num_entries) { - return 0; - } -- st_foreach(a->fields_byname, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args); -+ st_foreach(a->fields_byname, (hash_function_foreach) st_equal_foreach, (st_data_t) & args); - return args.rval; - } - -diff --git a/c/src/datum_size.c b/c/src/datum_size.c -index be9b98004ef..3877f31384c 100644 ---- a/c/src/datum_size.c -+++ b/c/src/datum_size.c -@@ -126,7 +126,7 @@ size_map(avro_writer_t writer, const avro_encoding_t * enc, - if (datum->map->num_entries) { - size_accum(rval, size, - enc->size_long(writer, datum->map->num_entries)); -- st_foreach(datum->map, HASH_FUNCTION_CAST size_map_foreach, (st_data_t) & args); -+ st_foreach(datum->map, (hash_function_foreach) size_map_foreach, (st_data_t) & args); - size += args.size; - } - if (!args.rval) { -diff --git a/c/src/datum_validate.c b/c/src/datum_validate.c -index 6167bd63ff6..e997d306761 100644 ---- a/c/src/datum_validate.c -+++ b/c/src/datum_validate.c -@@ -123,7 +123,7 @@ avro_schema_datum_validate(avro_schema_t expected_schema, avro_datum_t datum) - { avro_schema_to_map(expected_schema)->values, 1 - }; - st_foreach(avro_datum_to_map(datum)->map, -- HASH_FUNCTION_CAST schema_map_validate_foreach, -+ (hash_function_foreach) schema_map_validate_foreach, - (st_data_t) & vst); - return vst.rval; - } -diff --git a/c/src/memoize.c b/c/src/memoize.c -index 933fecbd043..e3602884d0d 100644 ---- a/c/src/memoize.c -+++ b/c/src/memoize.c -@@ -52,8 +52,8 @@ avro_memoize_key_hash(avro_memoize_key_t *a) - - - static struct st_hash_type avro_memoize_hash_type = { -- HASH_FUNCTION_CAST avro_memoize_key_cmp, -- HASH_FUNCTION_CAST avro_memoize_key_hash -+ (hash_function_compare) avro_memoize_key_cmp, -+ (hash_function_hash) avro_memoize_key_hash - }; - - -@@ -78,7 +78,7 @@ avro_memoize_free_key(avro_memoize_key_t *key, void *result, void *dummy) - void - avro_memoize_done(avro_memoize_t *mem) - { -- st_foreach((st_table *) mem->cache, HASH_FUNCTION_CAST avro_memoize_free_key, 0); -+ st_foreach((st_table *) mem->cache, (hash_function_foreach) avro_memoize_free_key, 0); - st_free_table((st_table *) mem->cache); - memset(mem, 0, sizeof(avro_memoize_t)); - } -diff --git a/c/src/schema.c b/c/src/schema.c -index 2acad51a13c..a4d8e9f898a 100644 ---- a/c/src/schema.c -+++ b/c/src/schema.c -@@ -137,7 +137,7 @@ static void avro_schema_free(avro_schema_t schema) - if (record->space) { - avro_str_free(record->space); - } -- st_foreach(record->fields, HASH_FUNCTION_CAST record_free_foreach, -+ st_foreach(record->fields, (hash_function_foreach) record_free_foreach, - 0); - st_free_table(record->fields_byname); - st_free_table(record->fields); -@@ -152,7 +152,7 @@ static void avro_schema_free(avro_schema_t schema) - if (enump->space) { - avro_str_free(enump->space); - } -- st_foreach(enump->symbols, HASH_FUNCTION_CAST enum_free_foreach, -+ st_foreach(enump->symbols, (hash_function_foreach) enum_free_foreach, - 0); - st_free_table(enump->symbols); - st_free_table(enump->symbols_byname); -@@ -189,7 +189,7 @@ static void avro_schema_free(avro_schema_t schema) - case AVRO_UNION:{ - struct avro_union_schema_t *unionp; - unionp = avro_schema_to_union(schema); -- st_foreach(unionp->branches, HASH_FUNCTION_CAST union_free_foreach, -+ st_foreach(unionp->branches, (hash_function_foreach) union_free_foreach, - 0); - st_free_table(unionp->branches); - st_free_table(unionp->branches_byname); -@@ -1239,7 +1239,7 @@ avro_schema_from_json_root(json_t *root, avro_schema_t *schema) - /* json_dumpf(root, stderr, 0); */ - rval = avro_schema_from_json_t(root, schema, named_schemas, NULL); - json_decref(root); -- st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0); -+ st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0); - st_free_table(named_schemas); - return rval; - } -@@ -1455,7 +1455,7 @@ avro_schema_t avro_schema_copy(avro_schema_t schema) - } - - new_schema = avro_schema_copy_root(schema, named_schemas); -- st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0); -+ st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0); - st_free_table(named_schemas); - return new_schema; - } -diff --git a/c/src/st.c b/c/src/st.c -index 27578289ecb..8437777cb92 100644 ---- a/c/src/st.c -+++ b/c/src/st.c -@@ -39,8 +39,8 @@ struct st_table_entry { - static int numcmp(long, long); - static int numhash(long); - static struct st_hash_type type_numhash = { -- HASH_FUNCTION_CAST numcmp, -- HASH_FUNCTION_CAST numhash -+ (hash_function_compare) numcmp, -+ (hash_function_hash) numhash - }; - - /* -@@ -48,8 +48,8 @@ static struct st_hash_type type_numhash = { - */ - static int strhash(const char *); - static struct st_hash_type type_strhash = { -- HASH_FUNCTION_CAST strcmp, -- HASH_FUNCTION_CAST strhash -+ (hash_function_compare) strcmp, -+ (hash_function_hash) strhash - }; - - static void rehash(st_table *); -@@ -212,7 +212,7 @@ void st_free_table(st_table *table) - } - - #define PTR_NOT_EQUAL(table, ptr, hash_val, key) \ --((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key))) -+((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (void*) (key), (void*) (ptr)->key))) - - #ifdef HASH_LOG - #define COLLISION collision++ -@@ -237,7 +237,7 @@ int st_lookup(st_table *table, register st_data_t key, st_data_t *value) - unsigned int hash_val, bin_pos; - register st_table_entry *ptr; - -- hash_val = do_hash(key, table); -+ hash_val = do_hash((void*) key, table); - FIND_ENTRY(table, ptr, hash_val, bin_pos); - - if (ptr == 0) { -@@ -272,7 +272,7 @@ int st_insert(register st_table *table, register st_data_t key, st_data_t value) - unsigned int hash_val, bin_pos; - register st_table_entry *ptr; - -- hash_val = do_hash(key, table); -+ hash_val = do_hash((void*) key, table); - FIND_ENTRY(table, ptr, hash_val, bin_pos); - - if (ptr == 0) { -@@ -288,7 +288,7 @@ void st_add_direct(st_table *table,st_data_t key,st_data_t value) - { - unsigned int hash_val, bin_pos; - -- hash_val = do_hash(key, table); -+ hash_val = do_hash((void*) key, table); - bin_pos = hash_val % table->num_bins; - ADD_DIRECT(table, key, value, hash_val, bin_pos); - } -@@ -363,7 +363,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value) - st_table_entry *tmp; - register st_table_entry *ptr; - -- hash_val = do_hash_bin(*key, table); -+ hash_val = do_hash_bin((void*) *key, table); - ptr = table->bins[hash_val]; - - if (ptr == 0) { -@@ -372,7 +372,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value) - return 0; - } - -- if (EQUAL(table, *key, ptr->key)) { -+ if (EQUAL(table, (void*) *key, (void*) ptr->key)) { - table->bins[hash_val] = ptr->next; - table->num_entries--; - if (value != 0) -@@ -383,7 +383,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value) - } - - for (; ptr->next != 0; ptr = ptr->next) { -- if (EQUAL(table, ptr->next->key, *key)) { -+ if (EQUAL(table, (void*) ptr->next->key, (void*) *key)) { - tmp = ptr->next; - ptr->next = ptr->next->next; - table->num_entries--; -@@ -403,7 +403,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v - unsigned int hash_val; - register st_table_entry *ptr; - -- hash_val = do_hash_bin(*key, table); -+ hash_val = do_hash_bin((void*) *key, table); - ptr = table->bins[hash_val]; - - if (ptr == 0) { -@@ -413,7 +413,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v - } - - for (; ptr != 0; ptr = ptr->next) { -- if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) { -+ if ((ptr->key != never) && EQUAL(table, (void*) ptr->key, (void*) *key)) { - table->num_entries--; - *key = ptr->key; - if (value != 0) -@@ -439,11 +439,11 @@ void st_cleanup_safe(st_table *table,st_data_t never) - { - int num_entries = table->num_entries; - -- st_foreach(table, HASH_FUNCTION_CAST delete_never, never); -+ st_foreach(table, (hash_function_foreach) delete_never, never); - table->num_entries = num_entries; - } - --int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg) -+int st_foreach(st_table *table,int (*func) (void*, void*, void*),st_data_t arg) - { - st_table_entry *ptr, *last, *tmp; - enum st_retval retval; -@@ -452,7 +452,9 @@ int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg) - for (i = 0; i < table->num_bins; i++) { - last = 0; - for (ptr = table->bins[i]; ptr != 0;) { -- retval = (enum st_retval) (*func) (ptr->key, ptr->record, arg); -+ retval = (enum st_retval) (*func) ((void*) ptr->key, -+ (void*) ptr->record, -+ (void*) arg); - switch (retval) { - case ST_CHECK: /* check if hash is modified during - * iteration */ -diff --git a/c/src/st.h b/c/src/st.h -index cf8a2249169..93da018bd9b 100644 ---- a/c/src/st.h -+++ b/c/src/st.h -@@ -20,26 +20,22 @@ extern "C" { - - #pragma GCC visibility push(hidden) - --#ifndef ANYARGS -- #ifdef __cplusplus -- #define ANYARGS ... -- #else -- #define ANYARGS -- #endif --#endif -- - #ifdef _WIN32 -- #define HASH_FUNCTION_CAST (int (__cdecl *)(ANYARGS)) -+ typedef int (__cdecl *hash_function_compare)(void*, void*); -+ typedef int (__cdecl *hash_function_hash)(void*); -+ typedef int (__cdecl *hash_function_foreach)(void*, void*, void*); - #else -- #define HASH_FUNCTION_CAST -+ typedef int (*hash_function_compare)(void*, void*); -+ typedef int (*hash_function_hash)(void*); -+ typedef int (*hash_function_foreach)(void*, void*, void*); - #endif - - typedef uintptr_t st_data_t; - typedef struct st_table st_table; - - struct st_hash_type { -- int (*compare) (ANYARGS); -- int (*hash) (ANYARGS); -+ hash_function_compare compare; -+ hash_function_hash hash; - }; - - struct st_table { -@@ -67,7 +63,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *)); - int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t)); - int st_insert _((st_table *, st_data_t, st_data_t)); - int st_lookup _((st_table *, st_data_t, st_data_t *)); --int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t)); -+int st_foreach _((st_table *, hash_function_foreach, st_data_t)); - void st_add_direct _((st_table *, st_data_t, st_data_t)); - void st_free_table _((st_table *)); - void st_cleanup_safe _((st_table *, st_data_t)); diff --git a/community/avro/no-werror-for-c++.patch b/community/avro/no-werror-for-c++.patch index cdc08954305..4f52b084957 100644 --- a/community/avro/no-werror-for-c++.patch +++ b/community/avro/no-werror-for-c++.patch @@ -1,11 +1,11 @@ --- a/c++/CMakeLists.txt +++ b/c++/CMakeLists.txt -@@ -64,7 +64,7 @@ +@@ -75,7 +75,7 @@ if (WIN32 AND NOT CYGWIN AND NOT MSYS) endif() if (CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") - if (AVRO_ADD_PROTECTOR_FLAGS) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fstack-protector-all -D_GLIBCXX_DEBUG") - # Unset _GLIBCXX_DEBUG for avrogencpp.cc because using Boost Program Options +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wuseless-cast -Wconversion -pedantic -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wuseless-cast -Wconversion -pedantic") + endif () + + if (AVRO_BUILD_TESTS OR AVRO_USE_BOOST) diff --git a/community/avro/nostatic.patch b/community/avro/nostatic.patch index 39e08a20f5c..02b1223e87d 100644 --- a/community/avro/nostatic.patch +++ b/community/avro/nostatic.patch @@ -1,56 +1,7 @@ don't build static libs at all, and link cli tools to shared -- -diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt -index 6098613..de2d56b 100644 ---- a/c++/CMakeLists.txt -+++ b/c++/CMakeLists.txt -@@ -119,24 +119,18 @@ add_library (avrocpp SHARED ${AVRO_SOURCE_FILES}) - set_property (TARGET avrocpp - APPEND PROPERTY COMPILE_DEFINITIONS AVRO_DYN_LINK) - --add_library (avrocpp_s STATIC ${AVRO_SOURCE_FILES}) --target_include_directories(avrocpp_s PRIVATE ${SNAPPY_INCLUDE_DIR}) -- --set_property (TARGET avrocpp avrocpp_s -+set_property (TARGET avrocpp - APPEND PROPERTY COMPILE_DEFINITIONS AVRO_SOURCE) - - set_target_properties (avrocpp PROPERTIES - VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}) - --set_target_properties (avrocpp_s PROPERTIES -- VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}) -- - target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) - target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) - - add_executable (precompile test/precompile.cc) - --target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) -+target_link_libraries (precompile avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) - - macro (gen file ns) - add_custom_command (OUTPUT ${file}.hh -@@ -166,7 +160,7 @@ gen (primitivetypes pt) - gen (cpp_reserved_words cppres) - - add_executable (avrogencpp impl/avrogencpp.cc) --target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) -+target_link_libraries (avrogencpp avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) - - enable_testing() - -@@ -204,7 +198,7 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") - - include (CPack) - --install (TARGETS avrocpp avrocpp_s -+install (TARGETS avrocpp - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION lib) diff --git a/c/src/CMakeLists.txt b/c/src/CMakeLists.txt -index c1761c8..6232a83 100644 +index c1761c8de..6232a83f2 100644 --- a/c/src/CMakeLists.txt +++ b/c/src/CMakeLists.txt @@ -115,7 +115,7 @@ install(TARGETS avro-static diff --git a/community/avro/pkgconf.patch b/community/avro/pkgconf.patch index 76e4cab5c77..9fb25770902 100644 --- a/community/avro/pkgconf.patch +++ b/community/avro/pkgconf.patch @@ -1,6 +1,6 @@ @ doesn't expand there, snappy doesn't exist diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt -index aa923e1..f76bc88 100644 +index 123676b3d..ca460e244 100644 --- a/c/CMakeLists.txt +++ b/c/CMakeLists.txt @@ -176,7 +176,7 @@ else (LZMA_FOUND) diff --git a/community/avro/version-bash.patch b/community/avro/version-bash.patch index 4e981aab95d..b35cec9b503 100644 --- a/community/avro/version-bash.patch +++ b/community/avro/version-bash.patch @@ -1,5 +1,5 @@ diff --git a/c/version.sh b/c/version.sh -index be90c0f..446edbc 100755 +index 0481bcc23..54231d5d6 100755 --- a/c/version.sh +++ b/c/version.sh @@ -1,4 +1,4 @@