Date: Thu, 5 Nov 2015 02:01:13 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400822 - head/devel/android-tools-adb-devel/files Message-ID: <201511050201.tA521D59070836@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Nov 5 02:01:13 2015 New Revision: 400822 URL: https://svnweb.freebsd.org/changeset/ports/400822 Log: 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 Modified: head/devel/android-tools-adb-devel/files/Makefile (contents, props changed) Modified: head/devel/android-tools-adb-devel/files/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/files/Makefile Thu Nov 5 01:52:50 2015 (r400821) +++ head/devel/android-tools-adb-devel/files/Makefile Thu Nov 5 02:01:13 2015 (r400822) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511050201.tA521D59070836>