From 33a1e73babd5088f04f97d5ebdaf3cd34330577f Mon Sep 17 00:00:00 2001 From: Andrey Zabolotnyi Date: Sat, 12 May 2018 07:42:38 -0600 Subject: [PATCH] LibTargets.mk, tools/Config.mk: Drop executable bit on installed libraries. The rules to install libraries under lib/ were modified to use mode 0644 instead of the default 0755. --- LibTargets.mk | 54 ++++++++++++++++++++++++------------------------- tools/Config.mk | 12 +++++++++-- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/LibTargets.mk b/LibTargets.mk index 873958f00a..9d64d7a8a6 100644 --- a/LibTargets.mk +++ b/LibTargets.mk @@ -1,7 +1,7 @@ ############################################################################ # LibTargets.mk # -# Copyright (C) 2007-2012, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2007-2012, 2014, 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -44,91 +44,91 @@ libc$(DELIM)libkc$(LIBEXT): context $(Q) $(MAKE) -C libc TOPDIR="$(TOPDIR)" libkc$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libkc$(LIBEXT): libc$(DELIM)libkc$(LIBEXT) - $(Q) install libc$(DELIM)libkc$(LIBEXT) lib$(DELIM)libkc$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) libnx$(DELIM)libknx$(LIBEXT): context $(Q) $(MAKE) -C libnx TOPDIR="$(TOPDIR)" libknx$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libknx$(LIBEXT): libnx$(DELIM)libknx$(LIBEXT) - $(Q) install libnx$(DELIM)libknx$(LIBEXT) lib$(DELIM)libknx$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) mm$(DELIM)libkmm$(LIBEXT): context $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libkmm$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libkmm$(LIBEXT): mm$(DELIM)libkmm$(LIBEXT) - $(Q) install mm$(DELIM)libkmm$(LIBEXT) lib$(DELIM)libkmm$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) $(ARCH_SRC)$(DELIM)libkarch$(LIBEXT): context $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libkarch$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libkarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libkarch$(LIBEXT) - $(Q) install $(ARCH_SRC)$(DELIM)libkarch$(LIBEXT) lib$(DELIM)libkarch$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) sched$(DELIM)libsched$(LIBEXT): context $(Q) $(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libsched$(LIBEXT): sched$(DELIM)libsched$(LIBEXT) - $(Q) install sched$(DELIM)libsched$(LIBEXT) lib$(DELIM)libsched$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) net$(DELIM)libnet$(LIBEXT): context $(Q) $(MAKE) -C net TOPDIR="$(TOPDIR)" libnet$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libnet$(LIBEXT): net$(DELIM)libnet$(LIBEXT) - $(Q) install net$(DELIM)libnet$(LIBEXT) lib$(DELIM)libnet$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) configs$(DELIM)libconfigs$(LIBEXT): context $(Q) $(MAKE) -C configs TOPDIR="$(TOPDIR)" libconfigs$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libconfigs$(LIBEXT): configs$(DELIM)libconfigs$(LIBEXT) - $(Q) install configs$(DELIM)libconfigs$(LIBEXT) lib$(DELIM)libconfigs$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) crypto$(DELIM)libcrypto$(LIBEXT): context $(Q) $(MAKE) -C crypto TOPDIR="$(TOPDIR)" libcrypto$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libcrypto$(LIBEXT): crypto$(DELIM)libcrypto$(LIBEXT) - $(Q) install crypto$(DELIM)libcrypto$(LIBEXT) lib$(DELIM)libcrypto$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) fs$(DELIM)libfs$(LIBEXT): context $(Q) $(MAKE) -C fs TOPDIR="$(TOPDIR)" libfs$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libfs$(LIBEXT): fs$(DELIM)libfs$(LIBEXT) - $(Q) install fs$(DELIM)libfs$(LIBEXT) lib$(DELIM)libfs$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) drivers$(DELIM)libdrivers$(LIBEXT): context $(Q) $(MAKE) -C drivers TOPDIR="$(TOPDIR)" libdrivers$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libdrivers$(LIBEXT): drivers$(DELIM)libdrivers$(LIBEXT) - $(Q) install drivers$(DELIM)libdrivers$(LIBEXT) lib$(DELIM)libdrivers$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) binfmt$(DELIM)libbinfmt$(LIBEXT): context $(Q) $(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libbinfmt$(LIBEXT): binfmt$(DELIM)libbinfmt$(LIBEXT) - $(Q) install binfmt$(DELIM)libbinfmt$(LIBEXT) lib$(DELIM)libbinfmt$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) graphics$(DELIM)libgraphics$(LIBEXT): context $(Q) $(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libgraphics$(LIBEXT): graphics$(DELIM)libgraphics$(LIBEXT) - $(Q) install graphics$(DELIM)libgraphics$(LIBEXT) lib$(DELIM)libgraphics$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) audio$(DELIM)libaudio$(LIBEXT): context $(Q) $(MAKE) -C audio TOPDIR="$(TOPDIR)" libaudio$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libaudio$(LIBEXT): audio$(DELIM)libaudio$(LIBEXT) - $(Q) install audio$(DELIM)libaudio$(LIBEXT) lib$(DELIM)libaudio$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) wireless$(DELIM)libwireless$(LIBEXT): context $(Q) $(MAKE) -C wireless TOPDIR="$(TOPDIR)" libwireless$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libwireless$(LIBEXT): wireless$(DELIM)libwireless$(LIBEXT) - $(Q) install wireless$(DELIM)libwireless$(LIBEXT) lib$(DELIM)libwireless$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) $(ARCH_SRC)$(DELIM)libarch$(LIBEXT): context $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libarch$(LIBEXT) - $(Q) install $(ARCH_SRC)$(DELIM)libarch$(LIBEXT) lib$(DELIM)libarch$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) # Special case @@ -136,7 +136,7 @@ syscall$(DELIM)libstubs$(LIBEXT): context $(Q) $(MAKE) -C syscall TOPDIR="$(TOPDIR)" libstubs$(LIBEXT) # KERNEL=y EXTRADEFINES=$(KDEFINE) lib$(DELIM)libstubs$(LIBEXT): syscall$(DELIM)libstubs$(LIBEXT) - $(Q) install syscall$(DELIM)libstubs$(LIBEXT) lib$(DELIM)libstubs$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) # Possible user-mode builds @@ -144,43 +144,43 @@ libc$(DELIM)libuc$(LIBEXT): context $(Q) $(MAKE) -C libc TOPDIR="$(TOPDIR)" libuc$(LIBEXT) KERNEL=n lib$(DELIM)libuc$(LIBEXT): libc$(DELIM)libuc$(LIBEXT) - $(Q) install libc$(DELIM)libuc$(LIBEXT) lib$(DELIM)libuc$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) libnx$(DELIM)libunx$(LIBEXT): context $(Q) $(MAKE) -C libnx TOPDIR="$(TOPDIR)" libunx$(LIBEXT) KERNEL=n lib$(DELIM)libunx$(LIBEXT): libnx$(DELIM)libunx$(LIBEXT) - $(Q) install libnx$(DELIM)libunx$(LIBEXT) lib$(DELIM)libunx$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) mm$(DELIM)libumm$(LIBEXT): context $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libumm$(LIBEXT) KERNEL=n lib$(DELIM)libumm$(LIBEXT): mm$(DELIM)libumm$(LIBEXT) - $(Q) install mm$(DELIM)libumm$(LIBEXT) lib$(DELIM)libumm$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT): context $(Q) $(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libuarch$(LIBEXT) KERNEL=n lib$(DELIM)libuarch$(LIBEXT): $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT) - $(Q) install $(ARCH_SRC)$(DELIM)libuarch$(LIBEXT) lib$(DELIM)libuarch$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) libxx$(DELIM)libcxx$(LIBEXT): context $(Q) $(MAKE) -C libxx TOPDIR="$(TOPDIR)" libcxx$(LIBEXT) KERNEL=n lib$(DELIM)libcxx$(LIBEXT): libxx$(DELIM)libcxx$(LIBEXT) - $(Q) install libxx$(DELIM)libcxx$(LIBEXT) lib$(DELIM)libcxx$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) $(APPDIR)$(DELIM)libapps$(LIBEXT): context $(Q) $(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" libapps$(LIBEXT) KERNEL=n lib$(DELIM)libapps$(LIBEXT): $(APPDIR)$(DELIM)libapps$(LIBEXT) - $(Q) install $(APPDIR)$(DELIM)libapps$(LIBEXT) lib$(DELIM)libapps$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) syscall$(DELIM)libproxies$(LIBEXT): context $(Q) $(MAKE) -C syscall TOPDIR="$(TOPDIR)" libproxies$(LIBEXT) KERNEL=n lib$(DELIM)libproxies$(LIBEXT): syscall$(DELIM)libproxies$(LIBEXT) - $(Q) install syscall$(DELIM)libproxies$(LIBEXT) lib$(DELIM)libproxies$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) # Possible non-kernel builds @@ -188,16 +188,16 @@ libc$(DELIM)libc$(LIBEXT): context $(Q) $(MAKE) -C libc TOPDIR="$(TOPDIR)" libc$(LIBEXT) lib$(DELIM)libc$(LIBEXT): libc$(DELIM)libc$(LIBEXT) - $(Q) install libc$(DELIM)libc$(LIBEXT) lib$(DELIM)libc$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) libnx$(DELIM)libnx$(LIBEXT): context $(Q) $(MAKE) -C libnx TOPDIR="$(TOPDIR)" libnx$(LIBEXT) lib$(DELIM)libnx$(LIBEXT): libnx$(DELIM)libnx$(LIBEXT) - $(Q) install libnx$(DELIM)libnx$(LIBEXT) lib$(DELIM)libnx$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) mm$(DELIM)libmm$(LIBEXT): context $(Q) $(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT) lib$(DELIM)libmm$(LIBEXT): mm$(DELIM)libmm$(LIBEXT) - $(Q) install mm$(DELIM)libmm$(LIBEXT) lib$(DELIM)libmm$(LIBEXT) + $(Q) $(call INSTALL_LIB,$<,$@) diff --git a/tools/Config.mk b/tools/Config.mk index 9a78aea743..21a18d3c4f 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -2,7 +2,7 @@ # Config.mk # Global build rules and macros. # -# Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2011, 2013-2014, 2018 Gregory Nutt. All rights reserved. # Author: Richard Cochran # Gregory Nutt # @@ -65,7 +65,7 @@ else endif # INCDIR - Convert a list of directory paths to a list of compiler include -# directirves +# directories # Example: CFFLAGS += ${shell $(INCDIR) [options] "compiler" "dir1" "dir2" "dir2" ...} # # Note that the compiler string and each directory path string must quoted if @@ -152,6 +152,14 @@ define ASSEMBLE $(Q) $(CC) -c $(AFLAGS) $1 -o $2 endef +# INSTALL_LIB - Install a library $1 into target $2 +# Example: $(call INSTALL_LIB, libabc.a, $(TOPDIR)/lib/) + +define INSTALL_LIB + @echo "IN: $1 -> $2" + $(Q) install -m 0644 $1 $2 +endef + # MOVEOBJ - Default macro to move an object file to the correct location # Example: $(call MOVEOBJ, prefix, directory) #