folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ETHER: Remove support for statically linking libpcap on Linux and OS X platforms

Browse source
This commit is contained in:
Mark Pizzolato 2014-09-21 16:31:49 -07:00
parent 56236ac5f0
commit 9b02e16ce4
5 changed files with 46 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
0readme_ethernet.txt
View file

@ -325,8 +325,9 @@ Building on Linux, {Free|Net|Open}BSD, OS/X, Solaris, other *nix:
binaries will run on any system whether or not libpcap is installed. If binaries will run on any system whether or not libpcap is installed. If
you want to force direct libpcap linking during a build you do so by you want to force direct libpcap linking during a build you do so by
typing 'make USE_NETWORK=1'. You must build with gcc to do this. There typing 'make USE_NETWORK=1'. You must build with gcc to do this. There
is no observable benefit to statically linking against libpcap and as is no observable benefit to statically linking against libpcap. Support
such support for this ia deprecated and will be removed in the future. for statically linking libpcap ia deprecated on all platforms except
Linux and OS X where it has already been removed.
4. Some platforms (HP-UX in particular) may not have vendor supplied libpcap 4. Some platforms (HP-UX in particular) may not have vendor supplied libpcap
components available and installed with the operating system. The packages components available and installed with the operating system. The packages

2
build_mingw.bat
View file

@ -7,7 +7,7 @@ rem run with networking support when the WinPcap environment
rem is installed on the running system. rem is installed on the running system.
rem rem
rem Individual simulator sources are in .\simulator_name rem Individual simulator sources are in .\simulator_name
rem Individual simulator executables are to .\bin rem Individual simulator executables are to .\BIN
rem rem
rem If needed, define the path for the MINGW bin directory. rem If needed, define the path for the MINGW bin directory.
rem (this should already be set if MINGW was installed correctly) rem (this should already be set if MINGW was installed correctly)

18
build_mingw_ether.bat
View file

@ -1,16 +1,6 @@
@echo off @echo off
rem Built in Ethernet support (requires WinPcap installed) rem Built in Ethernet support (requires WinPcap installed).
rem The normal Windows build always builds with Ethernet support
rem so, this procedure is un-necessary. Just call the normal build
rem rem
rem Compile all of SIMH using MINGW make and gcc environment %~p0\build_mingw.bat %*
rem Individual simulator sources are in .\simulator_name
rem Individual simulator executables are to .\bin
rem
rem If needed, define the path for the MINGW bin directory.
rem (this should already be set if MINGW was installed correctly)
rem
gcc -v 1>NUL 2>NUL
if ERRORLEVEL 1 path C:\MinGW\bin;%path%
if not exist BIN mkdir BIN
gcc -v 1>NUL 2>NUL
if ERRORLEVEL 1 echo "MinGW Environment Unavailable"
mingw32-make WIN32=1 USE_NETWORK=1 -f makefile %*

2
build_mingw_noasync.bat
View file

@ -2,7 +2,7 @@
rem Build without SIM_ASYNCH_IO defined (avoiding the use of pthreads) rem Build without SIM_ASYNCH_IO defined (avoiding the use of pthreads)
rem Compile all of SIMH using MINGW make and gcc environment rem Compile all of SIMH using MINGW make and gcc environment
rem Individual simulator sources are in .\simulator_name rem Individual simulator sources are in .\simulator_name
rem Individual simulator executables are to .\bin rem Individual simulator executables are to .\BIN
rem rem
rem If needed, define the path for the MINGW bin directory. rem If needed, define the path for the MINGW bin directory.
rem (this should already be set if MINGW was installed correctly) rem (this should already be set if MINGW was installed correctly)

63
makefile
View file

@ -369,13 +369,13 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
endif endif
endif endif
ifeq (,$(findstring HAVE_LIBSDL,$(OS_CCDEFS))) ifeq (,$(findstring HAVE_LIBSDL,$(OS_CCDEFS)))
$(info *** Warning ***) $(info *** Info ***)
$(info *** Warning *** The simulator$(BUILD_MULTIPLE) you are building could provide more) $(info *** Info *** The simulator$(BUILD_MULTIPLE) you are building could provide more)
$(info *** Warning *** functionality if video support were available on your system.) $(info *** Info *** functionality if video support were available on your system.)
$(info *** Warning *** Install the development components of libSDL packaged by your) $(info *** Info *** Install the development components of libSDL packaged by your)
$(info *** Warning *** operating system distribution and rebuild your simulator to) $(info *** Info *** operating system distribution and rebuild your simulator to)
$(info *** Warning *** enable this extra functionality.) $(info *** Info *** enable this extra functionality.)
$(info *** Warning ***) $(info *** Info ***)
endif endif
endif endif
ifneq (,$(NETWORK_USEFUL)) ifneq (,$(NETWORK_USEFUL))
@ -393,13 +393,24 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifneq (,$(call find_lib,$(PCAPLIB))) ifneq (,$(call find_lib,$(PCAPLIB)))
ifneq ($(USE_NETWORK),) # Network support specified on the GNU make command line ifneq ($(USE_NETWORK),) # Network support specified on the GNU make command line
NETWORK_CCDEFS += -DUSE_NETWORK NETWORK_CCDEFS += -DUSE_NETWORK
$(info *** Warning ***) ifeq (,$(findstring Linux,$(OSTYPE))$(findstring Darwin,$(OSTYPE)))
$(info *** Warning *** Statically linking against libpcap is provides no measurable) $(info *** Warning ***)
$(info *** Warning *** benefits over dynamically linking libpcap.) $(info *** Warning *** Statically linking against libpcap is provides no measurable)
$(info *** Warning ***) $(info *** Warning *** benefits over dynamically linking libpcap.)
$(info *** Warning *** Support for linking this way is currently deprecated and may be removed) $(info *** Warning ***)
$(info *** Warning *** in the future.) $(info *** Warning *** Support for linking this way is currently deprecated and may be removed)
$(info *** Warning ***) $(info *** Warning *** in the future.)
$(info *** Warning ***)
else
$(info *** Error ***)
$(info *** Error *** Statically linking against libpcap is provides no measurable)
$(info *** Error *** benefits over dynamically linking libpcap.)
$(info *** Error ***)
$(info *** Error *** Support for linking statically has been removed on the $(OSTYPE))
$(info *** Error *** platform.)
$(info *** Error ***)
$(error Retry your build without specifying USE_NETWORK=1)
endif
ifeq (cygwin,$(OSTYPE)) ifeq (cygwin,$(OSTYPE))
# cygwin has no ldconfig so explicitly specify pcap object library # cygwin has no ldconfig so explicitly specify pcap object library
NETWORK_LDFLAGS = -L$(dir $(call find_lib,$(PCAPLIB))) -Wl,-R,$(dir $(call find_lib,$(PCAPLIB))) -l$(PCAPLIB) NETWORK_LDFLAGS = -L$(dir $(call find_lib,$(PCAPLIB))) -Wl,-R,$(dir $(call find_lib,$(PCAPLIB))) -l$(PCAPLIB)
@ -514,19 +525,19 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
# Support is available on Linux for libvdeplug. Advise on its usage # Support is available on Linux for libvdeplug. Advise on its usage
ifneq (,$(findstring Linux,$(OSTYPE))) ifneq (,$(findstring Linux,$(OSTYPE)))
ifneq (,$(findstring USE_NETWORK,$(NETWORK_CCDEFS))$(findstring USE_SHARED,$(NETWORK_CCDEFS))) ifneq (,$(findstring USE_NETWORK,$(NETWORK_CCDEFS))$(findstring USE_SHARED,$(NETWORK_CCDEFS)))
$(info *** Warning ***) $(info *** Info ***)
$(info *** Warning *** $(BUILD_SINGLE)Simulator$(BUILD_MULTIPLE) are being built with) $(info *** Info *** $(BUILD_SINGLE)Simulator$(BUILD_MULTIPLE) are being built with)
$(info *** Warning *** minimal libpcap networking support) $(info *** Info *** minimal libpcap networking support)
$(info *** Warning ***) $(info *** Info ***)
endif endif
$(info *** Warning *** Simulators on your $(OSNAME) platform can also be built with) $(info *** Info *** Simulators on your $(OSNAME) platform can also be built with)
$(info *** Warning *** extended LAN Ethernet networking support by using VDE Ethernet.) $(info *** Info *** extended LAN Ethernet networking support by using VDE Ethernet.)
$(info *** Warning ***) $(info *** Info ***)
$(info *** Warning *** To build simulator(s) with extended networking support you) $(info *** Info *** To build simulator(s) with extended networking support you)
$(info *** Warning *** should read 0readme_ethernet.txt and follow the instructions) $(info *** Info *** should read 0readme_ethernet.txt and follow the instructions)
$(info *** Warning *** regarding the needed libvdeplug components for your $(OSNAME)) $(info *** Info *** regarding the needed libvdeplug components for your $(OSNAME))
$(info *** Warning *** platform) $(info *** Info *** platform)
$(info *** Warning ***) $(info *** Info ***)
endif endif
endif endif
ifneq (,$(call find_include,linux/if_tun)) ifneq (,$(call find_include,linux/if_tun))