[MERGED] osmo-trx[master]: build: More OBS build failure fixes

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sat Apr 28 08:16:48 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: build: More OBS build failure fixes
......................................................................


build: More OBS build failure fixes

It seems the order in which static code and -lfoo is passed to the
linker matters.

Change-Id: I3b25be0154053ae8eb5f0a24c39fb9a229130fcf
---
M Transceiver52M/Makefile.am
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index d6dec2d..bb253bb 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -84,9 +84,9 @@
 bin_PROGRAMS += osmo-trx-uhd
 osmo_trx_uhd_SOURCES = osmo-trx.cpp
 osmo_trx_uhd_LDADD = \
+	$(builddir)/device/uhd/libdevice.la \
 	$(COMMON_LDADD) \
-	$(UHD_LIBS) \
-	$(builddir)/device/uhd/libdevice.la
+	$(UHD_LIBS)
 osmo_trx_uhd_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)
 endif
 
@@ -94,8 +94,8 @@
 bin_PROGRAMS += osmo-trx-usrp1
 osmo_trx_usrp1_SOURCES = osmo-trx.cpp
 osmo_trx_usrp1_LDADD = \
+	$(builddir)/device/usrp1/libdevice.la \
 	$(COMMON_LDADD) \
-	$(USRP_LIBS) \
-	$(builddir)/device/usrp1/libdevice.la
+	$(USRP_LIBS)
 osmo_trx_usrp1_CPPFLAGS  = $(AM_CPPFLAGS) $(USRP_CFLAGS)
 endif

-- 
To view, visit https://gerrit.osmocom.org/7944
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b25be0154053ae8eb5f0a24c39fb9a229130fcf
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list