Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

base: use the accepted patch for nanohttp_stream. #46

Merged
merged 1 commit into from
Jan 3, 2024
Merged

base: use the accepted patch for nanohttp_stream. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ WORKDIR ${EPICS_MODULES_PATH}
COPY install_modules.sh .
RUN ./install_modules.sh

COPY nanohttp_stream.patch .
COPY backport-adsupport-nanohttp.patch .
COPY install_area_detector.sh .
RUN ./install_area_detector.sh

Expand Down
7 changes: 3 additions & 4 deletions base/nanohttp_stream.patch → base/backport-adsupport-nanohttp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
From https://github.com/areaDetector/ADSupport/pull/41
From 0ecb38c9b8981b4e92c2ebbdff5503052a5c0ba9 Mon Sep 17 00:00:00 2001
From 9326adbf88b7e4501b4ba1b53d267c2c3f921c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <[email protected]>
Date: Thu, 3 Aug 2023 08:16:00 -0300
Subject: [PATCH] Fix nanohttp_stream build with external libxml2.
Expand All @@ -16,14 +15,14 @@ only define IN_LIBXML in that case.
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportApp/xml2Src/Makefile b/supportApp/xml2Src/Makefile
index 1ba2696..1a0c189 100644
index 1ba2696..b855c48 100644
--- a/supportApp/xml2Src/Makefile
+++ b/supportApp/xml2Src/Makefile
@@ -123,6 +123,7 @@ ifeq ($(XML2_EXTERNAL),NO)
LIB_SRCS += xmlstring.c

nanohttp_stream_LIBS += xml2
+ USR_CFLAGS = -DIN_LIBXML
+ nanohttp_stream_CFLAGS += -DIN_LIBXML

else
nanohttp_stream_SYS_LIBS += xml2
Expand Down
2 changes: 1 addition & 1 deletion base/install_area_detector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ARAVIS_INCLUDE=$(pkg-config --cflags-only-I aravis-0.8 | sed -e "s|-I||g")

cd -

git apply --directory ADSupport ${EPICS_MODULES_PATH}/nanohttp_stream.patch
patch -d ADSupport -Np1 < ${EPICS_MODULES_PATH}/backport-adsupport-nanohttp.patch

make -j${JOBS}
make clean
Expand Down