Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 19:17:28 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[build] update to pcre2 (#3637)
Issues due date / Add labels to issues (push) Has been cancelled
Details
Doxygen / build (push) Has been cancelled
Details
Docker update / build_docker_image (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Fabien-B
2026-04-15 23:19:11 +02:00
committed by GitHub
parent 7e4d65d7fb
commit ccb0c4f55b
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/targets/nps_common.xml
+1 -2
View File
@@ -42,7 +42,7 @@ VPATH += $(PAPARAZZI_HOME)/var/share
<define name="BARO_PERIODIC_FREQUENCY" value="$(BARO_PERIODIC_FREQUENCY)"/> <define name="BARO_PERIODIC_FREQUENCY" value="$(BARO_PERIODIC_FREQUENCY)"/>
<define name="USE_BARO_BOARD" value="FALSE"/> <define name="USE_BARO_BOARD" value="FALSE"/>
<define name="USE_NPS"/> <define name="USE_NPS"/>
<flag name="LDFLAGS" value="lm -livy $(shell pcre-config --libs) -lgsl -lgslcblas"/> <flag name="LDFLAGS" value="lm -livy $(shell pcre2-config --libs8) -lgsl -lgslcblas"/>
<include name="$(PAPARAZZI_SRC)/sw/simulator"/> <include name="$(PAPARAZZI_SRC)/sw/simulator"/>
<include name="$(PAPARAZZI_SRC)/sw/simulator/nps"/> <include name="$(PAPARAZZI_SRC)/sw/simulator/nps"/>
<include name="$(PAPARAZZI_HOME)/conf/simulator/nps"/> <include name="$(PAPARAZZI_HOME)/conf/simulator/nps"/>
@@ -66,4 +66,3 @@ VPATH += $(PAPARAZZI_HOME)/var/share
<file name="nps_main_common.c" dir="$(NPS_DIR)"/> <file name="nps_main_common.c" dir="$(NPS_DIR)"/>
</makefile> </makefile>
</module> </module>
sw/ground_segment/misc/Makefile
+5 -3
View File
@@ -38,14 +38,16 @@ endif
GTK2_INC = $(shell pkg-config gtk+-2.0 --cflags 2> /dev/null) GTK2_INC = $(shell pkg-config gtk+-2.0 --cflags 2> /dev/null)
GTK2_LDFLAGS = $(shell pkg-config gtk+-2.0 --libs 2> /dev/null) GTK2_LDFLAGS = $(shell pkg-config gtk+-2.0 --libs 2> /dev/null)
PCRE_LDFLAGS= $(shell pcre2-config --libs8)
ifneq ($(GTK2_INC),) ifneq ($(GTK2_INC),)
CFLAGS += -Wall -fPIC -g CFLAGS += -Wall -fPIC -g
GTK_CFLAGS = $(GTK2_INC) -DGTK_DISABLE_DEPRECATED GTK_CFLAGS = $(GTK2_INC) -DGTK_DISABLE_DEPRECATED
GTK_LDFLAGS = $(GTK2_LDFLAGS) $(shell pkg-config --libs ivy-glib) $(shell pcre-config --libs) -fPIC GTK_LDFLAGS = $(GTK2_LDFLAGS) $(shell pkg-config --libs ivy-glib) $(PCRE_LDFLAGS) -fPIC
endif endif
GLIBIVY_CFLAGS = $(shell pkg-config --cflags ivy-glib) GLIBIVY_CFLAGS = $(shell pkg-config --cflags ivy-glib)
GLIBIVY_LDFLAGS = $(shell pkg-config --libs ivy-glib) $(shell pcre-config --libs) GLIBIVY_LDFLAGS = $(shell pkg-config --libs ivy-glib) $(PCRE_LDFLAGS)
# fallback to ivy-glib pkg-config info if there is no ivy-c.pc # fallback to ivy-glib pkg-config info if there is no ivy-c.pc
IVY_INC = $(shell pkg-config --cflags-only-I ivy-c 2> /dev/null) IVY_INC = $(shell pkg-config --cflags-only-I ivy-c 2> /dev/null)
@@ -56,7 +58,7 @@ IVY_LDFLAGS = $(shell pkg-config --libs-only-L ivy-glib) -livy
endif endif
# GLIB libraries # GLIB libraries
GLIB_LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lglibivy -lm $(shell pcre-config --libs) GLIB_LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lglibivy -lm $(PCRE_LDFLAGS)
# Paparazzi includes # Paparazzi includes
INCLUDES += $(shell pkg-config glib-2.0 --cflags) -I$(PAPARAZZI_SRC)/sw/airborne/ -I$(PAPARAZZI_SRC)/sw/include/ $(IVY_INC) INCLUDES += $(shell pkg-config glib-2.0 --cflags) -I$(PAPARAZZI_SRC)/sw/airborne/ -I$(PAPARAZZI_SRC)/sw/include/ $(IVY_INC)
sw/ground_segment/tmtc/Makefile
+4 -2
View File
@@ -99,8 +99,10 @@ ivy2serial : ivy2serial.cmo $(LIBPPRZCMA) $(LIBPPRZLINKCMA)
CC = gcc CC = gcc
PCRE_LDFLAGS= $(shell pcre2-config --libs8)
GLIBIVY_CFLAGS = -Wall -fPIC $(shell pkg-config --cflags ivy-glib) GLIBIVY_CFLAGS = -Wall -fPIC $(shell pkg-config --cflags ivy-glib)
GLIBIVY_LDFLAGS = $(shell pkg-config --libs ivy-glib) $(shell pcre-config --libs) GLIBIVY_LDFLAGS = $(shell pkg-config --libs ivy-glib) $(PCRE_LDFLAGS)
# #
# try to find include locations on OSX # try to find include locations on OSX
@@ -115,7 +117,7 @@ endif
app_server: app_server.c Makefile app_server: app_server.c Makefile
@echo OL $@ @echo OL $@
$(Q)$(CC) $(shell pkg-config libxml-2.0 gio-2.0 ivy-glib --cflags) -o $@ $< -lm -lz $(shell pkg-config libxml-2.0 gio-2.0 ivy-glib libpcre --libs) $(Q)$(CC) $(shell pkg-config libxml-2.0 gio-2.0 ivy-glib --cflags) -o $@ $< -lm -lz $(shell pkg-config libxml-2.0 gio-2.0 ivy-glib --libs) $(PCRE_LDFLAGS)
gpsd2ivy: gpsd2ivy.c Makefile gpsd2ivy: gpsd2ivy.c Makefile
ifeq (, $(shell which gpsd)) ifeq (, $(shell which gpsd))
sw/logalizer/Makefile
+4 -2
View File
@@ -107,19 +107,21 @@ gtk_export.ml : export.glade
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall CFLAGS=-g -O2 -Wall
PCRE_LDFLAGS= $(shell pcre2-config --libs8)
openlog2tlm: openlog2tlm.c openlog2tlm: openlog2tlm.c
@echo CC $@ @echo CC $@
$(Q)$(CC) $(CFLAGS) -o $@ $^ $(Q)$(CC) $(CFLAGS) -o $@ $^
DISP3D_CFLAGS = $(shell pkg-config --cflags ivy-glib gtk+-2.0 gtkgl-2.0) DISP3D_CFLAGS = $(shell pkg-config --cflags ivy-glib gtk+-2.0 gtkgl-2.0)
DISP3D_LDFLAGS = $(shell pkg-config --libs ivy-glib gtk+-2.0 gtkgl-2.0) $(shell pcre-config --libs) DISP3D_LDFLAGS = $(shell pkg-config --libs ivy-glib gtk+-2.0 gtkgl-2.0) $(PCRE_LDFLAGS)
disp3d: disp3d.c disp3d: disp3d.c
@echo CC $@ @echo CC $@
$(Q)$(CC) $(CFLAGS) $(DISP3D_CFLAGS) -o $@ $^ $(DISP3D_LDFLAGS) $(Q)$(CC) $(CFLAGS) $(DISP3D_CFLAGS) -o $@ $^ $(DISP3D_LDFLAGS)
IVY_C_LIBS = $(shell pkg-config --libs ivy-glib) $(shell pcre-config --libs) IVY_C_LIBS = $(shell pkg-config --libs ivy-glib) $(PCRE_LDFLAGS)
GLIBIVY_CFLAGS = $(shell pkg-config --cflags ivy-glib) GLIBIVY_CFLAGS = $(shell pkg-config --cflags ivy-glib)
# #