olsrd: only pud depends on libgps
authorNick Hainke <[email protected]>
Mon, 7 Jun 2021 18:43:04 +0000 (20:43 +0200)
committerPolynomdivision <[email protected]>
Tue, 8 Jun 2021 20:21:51 +0000 (22:21 +0200)
As a workaround for the glibc-fix the dependency on libgps was moved
to olsrd. However, only pud is using this library.

Signed-off-by: Nick Hainke <[email protected]>
(cherry picked from commit 27ac56adc643d0d79d33591e349a507711dfd38f)

olsrd/Makefile

index 82c3808c7cc89e938350443cda056049d49ccecb..726d5a35a15958dbb5f09b16793ea076e014bfc0 100644 (file)
@@ -170,11 +170,7 @@ MAKE_FLAGS+= \
        DESTDIR="$(PKG_INSTALL_DIR)" \
        STRIP="true" \
        INSTALL_LIB="true" \
-<<<<<<< HEAD
        SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog"
-=======
-       SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo filtergw jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog"
->>>>>>> 4f7791a (olsrd: update to 2021-06-07)
 
 define Build/Compile
        $(call Build/Compile/Default,all)