mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 04:31:29 +00:00
OS X build environment checks and fixes
This commit is contained in:
@@ -71,17 +71,25 @@ LDFLAGS += $(UNIVERSAL_LDFLAGS)
|
|||||||
PYTHON = $(JHBUILD_PREFIX)/bin/python2.7
|
PYTHON = $(JHBUILD_PREFIX)/bin/python2.7
|
||||||
OPENSSL_STATIC = $(JHBUILD_PREFIX)/lib/libssl.a $(JHBUILD_PREFIX)/lib/libcrypto.a
|
OPENSSL_STATIC = $(JHBUILD_PREFIX)/lib/libssl.a $(JHBUILD_PREFIX)/lib/libcrypto.a
|
||||||
|
|
||||||
$(IMAGE_NAME): $(IMAGE_STAGING_DIR)/$(PKG_NAME)
|
$(IMAGE_NAME): path-check tool-checks $(IMAGE_STAGING_DIR)/$(PKG_NAME)
|
||||||
rm -f $@
|
rm -f $@
|
||||||
hdiutil create -imagekey zlib-level=9 -srcfolder $(IMAGE_STAGING_DIR) $@
|
hdiutil create -imagekey zlib-level=9 -srcfolder $(IMAGE_STAGING_DIR) $@
|
||||||
|
|
||||||
|
path-check:
|
||||||
|
if (echo $(PATH) | grep -F "$(MACPORTS_PREFIX)"); then false; else echo "Path is OK"; fi
|
||||||
|
|
||||||
|
tool-checks: have-$(CC) have-jhbuild have-gtk-mac-bundler
|
||||||
|
|
||||||
|
have-%:
|
||||||
|
which $*
|
||||||
|
|
||||||
$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping check-nmap-update COPYING.formatted
|
$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping check-nmap-update COPYING.formatted
|
||||||
mkdir -p $(IMAGE_STAGING_DIR)
|
mkdir -p $(IMAGE_STAGING_DIR)
|
||||||
cp -rf $(EXTRA_DIST) $(IMAGE_STAGING_DIR)/
|
cp -rf $(EXTRA_DIST) $(IMAGE_STAGING_DIR)/
|
||||||
$(PACKAGEMAKER) --doc nmap.pmdoc --title "Nmap $(NMAP_VERSION)" --no-relocate -o $@
|
$(PACKAGEMAKER) --doc nmap.pmdoc --title "Nmap $(NMAP_VERSION)" --no-relocate -o $@
|
||||||
|
|
||||||
check-%: stage-%
|
check-%: stage-%
|
||||||
if (find $* -perm -a+x -type f | xargs otool -L | grep "$(JHBUILD_PREFIX)"); then false; else echo "Libs are clean"; fi
|
if (find $* -perm -a+x -type f | xargs otool -L | grep -F "$(JHBUILD_PREFIX)"); then false; else echo "Libs are clean"; fi
|
||||||
|
|
||||||
export-%:
|
export-%:
|
||||||
rm -rf $*
|
rm -rf $*
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ echo "Building bundle"
|
|||||||
# jhbuild build meta-gtk-osx-bootstrap
|
# jhbuild build meta-gtk-osx-bootstrap
|
||||||
# jhbuild build meta-gtk-osx-core
|
# jhbuild build meta-gtk-osx-core
|
||||||
# jhbuild build meta-gtk-osx-python
|
# jhbuild build meta-gtk-osx-python
|
||||||
gtk-mac-bundler "$SCRIPT_DIR/zenmap.bundle"
|
jhbuild run gtk-mac-bundler "$SCRIPT_DIR/zenmap.bundle"
|
||||||
|
|
||||||
echo "Stripping unoptimized Python libraries"
|
echo "Stripping unoptimized Python libraries"
|
||||||
#Remove some stuff that is unneeded. This cuts 40M off the installed size.
|
#Remove some stuff that is unneeded. This cuts 40M off the installed size.
|
||||||
@@ -45,8 +45,8 @@ find "$BASE/Resources/lib/python2.7" -type f -name '*.pyo' | while read py; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
echo "Building using distutils"
|
echo "Building using distutils"
|
||||||
python setup.py build --executable "/usr/bin/env python"
|
jhbuild run python setup.py build --executable "/usr/bin/env python"
|
||||||
python setup.py install vanilla --prefix "$BASE/Resources"
|
jhbuild run python setup.py install vanilla --prefix "$BASE/Resources"
|
||||||
|
|
||||||
# This isn't truly necessary, but it allows us to do a simpler check for problems later.
|
# This isn't truly necessary, but it allows us to do a simpler check for problems later.
|
||||||
echo "Rewriting linker paths to pass checks"
|
echo "Rewriting linker paths to pass checks"
|
||||||
|
|||||||
Reference in New Issue
Block a user