diff options
| author | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2024-08-25 16:29:06 -0300 |
|---|---|---|
| committer | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2024-08-25 17:32:51 -0300 |
| commit | 2a476dde46827b2ee44ba1b0c183cfe64df88167 (patch) | |
| tree | f65e9a511f53a0e721b0a62d6c8110aabe9c408d | |
| parent | 5cd917fc7e204ba29a51ac10bcebac7ddef88dbd (diff) | |
Updated debian patches
| -rw-r--r-- | debian/patches/0001-FIX-Update-build-target-from-dev-to-build.patch | 49 | ||||
| -rw-r--r-- | debian/patches/0002-Fix-cmake-call.patch | 29 | ||||
| -rw-r--r-- | debian/patches/0003-Fix-casting-function-address.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 4 |
4 files changed, 106 insertions, 1 deletions
diff --git a/debian/patches/0001-FIX-Update-build-target-from-dev-to-build.patch b/debian/patches/0001-FIX-Update-build-target-from-dev-to-build.patch new file mode 100644 index 0000000..4fcf043 --- /dev/null +++ b/debian/patches/0001-FIX-Update-build-target-from-dev-to-build.patch @@ -0,0 +1,49 @@ +From: Lucas de Castro Borges <lucas@gnuabordo.com.br> +Date: Sun, 25 Aug 2024 16:11:07 -0300 +Subject: FIX: Update build target from dev to build + + The dev build target depends on docker system for build system. + Futhermore, Makefile don't call the build script correctly. +--- + Makefile | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index 232bb95..d6f48b7 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,22 +23,22 @@ all: build_and_test docs + .PHONY: all + + clean: +- ./auto dev -e auto -a clean ++ ./auto clean + + build: clean +- ./auto dev -e auto -a build -a -t ++ ./auto build + .PHONY: build + + test: build +- ./auto dev -e auto -a test ++ ./auto test + .PHONY: test + + package: test +- ./auto dev -e auto -a package ++ ./auto package + .PHONY: smoke + + docs: smoke +- ./auto dev -e auto -a docs ++ ./auto build -e auto -a docs + .PHONY: package + + changed_files: +@@ -46,5 +46,5 @@ changed_files: + .PHONY: changed_files + + smoke: package +- ./auto dev -e auto -a smoke ++ ./auto build -e auto -a smoke + .PHONY: smoke diff --git a/debian/patches/0002-Fix-cmake-call.patch b/debian/patches/0002-Fix-cmake-call.patch new file mode 100644 index 0000000..f7e3ddc --- /dev/null +++ b/debian/patches/0002-Fix-cmake-call.patch @@ -0,0 +1,29 @@ +From: Lucas de Castro Borges <lucas@gnuabordo.com.br> +Date: Sun, 25 Aug 2024 16:26:54 -0300 +Subject: Fix cmake call + + Unknown argument when cmake been called. +--- + autolib/build.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autolib/build.sh b/autolib/build.sh +index 42ec7de..84638df 100644 +--- a/autolib/build.sh ++++ b/autolib/build.sh +@@ -19,7 +19,7 @@ autolib_build() { + pushd ${lib}/build > /dev/null || return $? + autolib_output_banner "${lib}: CMake Build Stage" + # YOU MUST set TEST to 1 in order to build the tests +- TEST=$build_test cmake -v .. || { ++ TEST=$build_test cmake .. || { + autolib_output_error "${lib}: CMake Failure" + return 1 + } +@@ -29,4 +29,4 @@ autolib_build() { + return 1 + } + popd > /dev/null || return $? +-} +\ No newline at end of file ++} diff --git a/debian/patches/0003-Fix-casting-function-address.patch b/debian/patches/0003-Fix-casting-function-address.patch new file mode 100644 index 0000000..01a3c6e --- /dev/null +++ b/debian/patches/0003-Fix-casting-function-address.patch @@ -0,0 +1,25 @@ +From 9266e5d9f420c39854dc74ca98b84b874a67d775 Mon Sep 17 00:00:00 2001 +From: Lucas Castro <lucas@gnuabordo.com.br> +Date: Thu, 8 Aug 2024 21:28:54 -0300 +Subject: [PATCH 1/2] Fix casting function address + + function attempted to return function address without cast type + It was required to modified it for successful build +--- + promhttp/src/promhttp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/promhttp/src/promhttp.c b/promhttp/src/promhttp.c +index d94a53e..ef359c2 100644 +--- a/promhttp/src/promhttp.c ++++ b/promhttp/src/promhttp.c +@@ -61,5 +61,5 @@ int promhttp_handler(void *cls, struct MHD_Connection *connection, const char *u + + struct MHD_Daemon *promhttp_start_daemon(unsigned int flags, unsigned short port, MHD_AcceptPolicyCallback apc, + void *apc_cls) { +- return MHD_start_daemon(flags, port, apc, apc_cls, &promhttp_handler, NULL, MHD_OPTION_END); ++ return MHD_start_daemon(flags, port, apc, apc_cls, (MHD_AccessHandlerCallback)(&promhttp_handler), NULL, MHD_OPTION_END); + } +-- +2.39.2 + diff --git a/debian/patches/series b/debian/patches/series index 4a97dfa..3604486 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ -# You must remove unused comment lines for the released package. +0001-FIX-Update-build-target-from-dev-to-build.patch +0002-Fix-cmake-call.patch +0003-Fix-casting-function-address.patch |
