[Openbts-discuss] [UMTS PATCH] build: ASN.1 and GCC build fixes

[Tom T. <to...@ts...>]

Address trivial build issues on certain Linux distribuitions (e.g.
Fedora 20 on which this patch was tested).

Most standard C++ libraries had unistd.h removed in GCC 4.7, so add it
back in explicitly.

Resolve the following ASN.1 build error by specifying the C language
tag.

libtool: compile: unable to infer tagged configuration
libtool: compile: specify a tag with `--tag'

Signed-off-by: Tom Tsou <to...@ts...>
---
 ASN/makefile                           | 2 +-
 CommonLibs/SocketsTest.cpp             | 1 +
 CommonLibs/Timeval.h                   | 1 +
 TransceiverRAD1/DummyLoad.cpp          | 2 +-
 TransceiverRAD1/FactoryCalibration.cpp | 1 +
 TransceiverRAD1/RAD1Device.cpp         | 2 +-
 TransceiverRAD1/rnrad1Core.cpp         | 1 +
 TransceiverRAD1/rnrad1Rx.cpp           | 1 +
 TransceiverRAD1/rnrad1Tx.cpp           | 1 +
 9 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ASN/makefile b/ASN/makefile
index 7a40aa5..4da1ee8 100644
--- a/ASN/makefile
+++ b/ASN/makefile
@@ -4843,7 +4843,7 @@ CFLAGS = -O3 -g -w
 #	cd $O && libtool --mode=compile $(CC) $(CFLAGS) -D'$(ASNDEBUG)' -I. -o $(@:$O/%=%) -c $(<:$O/%=%)
 
 $O/%.o: $O/%.c
-	cd $O && libtool --mode=compile $(CC) $(CFLAGS) -I. -o $(@:$O/%=%) -c $(<:$O/%=%)
+	cd $O && libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -I. -o $(@:$O/%=%) -c $(<:$O/%=%)
 
 clean:
 	rm -rf $(O)
diff --git a/CommonLibs/SocketsTest.cpp b/CommonLibs/SocketsTest.cpp
index b902710..b91f76d 100644
--- a/CommonLibs/SocketsTest.cpp
+++ b/CommonLibs/SocketsTest.cpp
@@ -17,6 +17,7 @@
 #include "Sockets.h"
 #include "Threads.h"
 #include <stdio.h>
+#include <unistd.h>
 #include <stdlib.h>
 
 
diff --git a/CommonLibs/Timeval.h b/CommonLibs/Timeval.h
index 05c5b08..6a2172d 100644
--- a/CommonLibs/Timeval.h
+++ b/CommonLibs/Timeval.h
@@ -17,6 +17,7 @@
 #ifndef TIMEVAL_H
 #define TIMEVAL_H
 
+#include <unistd.h>
 #include <stdint.h>
 #include "sys/time.h"
 #include <iostream>
diff --git a/TransceiverRAD1/DummyLoad.cpp b/TransceiverRAD1/DummyLoad.cpp
index 9158f7d..83702e8 100644
--- a/TransceiverRAD1/DummyLoad.cpp
+++ b/TransceiverRAD1/DummyLoad.cpp
@@ -18,7 +18,7 @@
 	SWLOOPBACK	compile for software loopback testing
 */ 
 
-
+#include <unistd.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/TransceiverRAD1/FactoryCalibration.cpp b/TransceiverRAD1/FactoryCalibration.cpp
index a1e7ea0..1af04c3 100644
--- a/TransceiverRAD1/FactoryCalibration.cpp
+++ b/TransceiverRAD1/FactoryCalibration.cpp
@@ -12,6 +12,7 @@
  * See the LEGAL file in the main directory for details.
  */
 
+#include <unistd.h>
 #include <FactoryCalibration.h>
 
 
diff --git a/TransceiverRAD1/RAD1Device.cpp b/TransceiverRAD1/RAD1Device.cpp
index 19b9502..53be3fb 100644
--- a/TransceiverRAD1/RAD1Device.cpp
+++ b/TransceiverRAD1/RAD1Device.cpp
@@ -19,7 +19,7 @@
 	SWLOOPBACK	compile for software loopback testing
 */ 
 
-
+#include <unistd.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/TransceiverRAD1/rnrad1Core.cpp b/TransceiverRAD1/rnrad1Core.cpp
index d0ea9fe..873933c 100644
--- a/TransceiverRAD1/rnrad1Core.cpp
+++ b/TransceiverRAD1/rnrad1Core.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include "fpga_regs.h"
+#include <unistd.h>
 #include <stdexcept>
 #include <assert.h>
 #include <math.h>
diff --git a/TransceiverRAD1/rnrad1Rx.cpp b/TransceiverRAD1/rnrad1Rx.cpp
index 3b1146e..f494e86 100644
--- a/TransceiverRAD1/rnrad1Rx.cpp
+++ b/TransceiverRAD1/rnrad1Rx.cpp
@@ -12,6 +12,7 @@
  * See the LEGAL file in the main directory for details.
  */
 
+#include <unistd.h>
 #include "rnrad1.h"
 
 using namespace ad9862;
diff --git a/TransceiverRAD1/rnrad1Tx.cpp b/TransceiverRAD1/rnrad1Tx.cpp
index 4c4befc..17fda22 100644
--- a/TransceiverRAD1/rnrad1Tx.cpp
+++ b/TransceiverRAD1/rnrad1Tx.cpp
@@ -12,6 +12,7 @@
  * See the LEGAL file in the main directory for details.
  */
 
+#include <unistd.h>
 #include "rnrad1.h"
 
 #include "ad9862.h"
-- 
1.9.3