aboutsummaryrefslogtreecommitdiffstats
path: root/devel/android-tools-adb-devel
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2015-11-05 10:01:13 +0800
committerjbeich <jbeich@FreeBSD.org>2015-11-05 10:01:13 +0800
commitcc7faf2147a66e32da943c682bad1369d8aba794 (patch)
tree471d37e26fbeb2bbb4df0ccf386c51602ba8f551 /devel/android-tools-adb-devel
parent30013e6e4ba8a4581d1fd6d337fd2386872182f5 (diff)
downloadfreebsd-ports-gnome-cc7faf2147a66e32da943c682bad1369d8aba794.tar.gz
freebsd-ports-gnome-cc7faf2147a66e32da943c682bad1369d8aba794.tar.zst
freebsd-ports-gnome-cc7faf2147a66e32da943c682bad1369d8aba794.zip
devel/android-tools-adb-devel: unbreak build on DragonFly (forgot in r400820)
make(1) suffix rules discard original extension as used by bsd.*.mk which leads to unpredictable behavior if more than one candidate is found under ${.PATH}. So, partially qualify pathname to avoid accidentally building libcutils/sockets.c despite SRCS=sockets.cpp $ echo 'void foo() { }' > a.c $ echo 'int main() { }' > a.cxx $ make PROG_CXX=test SRCS=a.cxx NO_MAN= -f /usr/share/mk/bsd.prog.mk cc -O -pipe -std=gnu99 -c a.c c++ -O -pipe -o test a.o /usr/lib/crt1.o: In function `_start': crt1.c:(.text+0x132): undefined reference to `main' *** Error code 1 which in adb case leads to (since partial C++ conversion in 6.0.0) adb.o: In function `handle_packet(apacket*, atransport*)': adb.cpp:(.text+0x2518): undefined reference to `find_local_socket(unsigned int, unsigned int)' adb.cpp:(.text+0x2613): undefined reference to `find_local_socket(unsigned int, unsigned int)' adb.cpp:(.text+0x276a): undefined reference to `find_local_socket(unsigned int, unsigned int)' adb.cpp:(.text+0x2875): undefined reference to `create_local_service_socket(char const*)' adb.cpp:(.text+0x288c): undefined reference to `create_remote_socket(unsigned int, atransport*)' adb.cpp:(.text+0x2a41): undefined reference to `create_remote_socket(unsigned int, atransport*)' adb_listeners.o: In function `listener_event_func(int, unsigned int, void*)': adb_listeners.cpp:(.text+0xe2): undefined reference to `create_local_socket(int)' adb_listeners.cpp:(.text+0xfe): undefined reference to `connect_to_remote(asocket*, char const*)' adb_listeners.o: In function `ss_listener_event_func(int, unsigned int, void*)': adb_listeners.cpp:(.text+0x1b1): undefined reference to `create_local_socket(int)' adb_listeners.cpp:(.text+0x1be): undefined reference to `connect_to_smartsocket(asocket*)' services.o: In function `host_service_to_socket(char const*, char const*)': services.cpp:(.text+0x64d): undefined reference to `create_local_socket(int)' services.cpp:(.text+0x6b7): undefined reference to `create_local_socket(int)' transport.o: In function `input_thread(void*)': transport.cpp:(.text+0x1931): undefined reference to `close_all_sockets(atransport*)' *** [adb] Error code 1
Diffstat (limited to 'devel/android-tools-adb-devel')
-rw-r--r--devel/android-tools-adb-devel/files/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile
index 575273fa7f7a..4b0466dae430 100644
--- a/devel/android-tools-adb-devel/files/Makefile
+++ b/devel/android-tools-adb-devel/files/Makefile
@@ -21,7 +21,8 @@ SRCS+= fdevent.cpp
SRCS+= file_sync_client.cpp
SRCS+= services.cpp
SRCS+= shell_service_protocol.cpp
-SRCS+= sockets.cpp
+# XXX SuffFindDeps may fail to restore suffix lost in transformation
+SRCS+= ../adb/sockets.cpp
SRCS+= transport.cpp
SRCS+= transport_local.cpp
SRCS+= transport_usb.cpp