Commit 6547bced authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- global whitespace trimming

parent 3471ebe0

package/ipsec-tools/ipsec-tools.mk

+16 −16
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ $(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched 
	  --disable-gssapi \

	  --with-kernel-headers=$(STAGING_DIR)/usr/include \

	  $(IPSEC_TOOLS_CONFIG_FLAGS) \

	); 

	)

	# simpler than patching that cruft..

	(echo '#undef bzero'; \

	 echo '#define bzero(a, b) memset((a), 0, (b))'; \

package/libdaemon/libdaemon.mk

+6 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#

# This library is free software; you can redistribute it

# and/or modify it under the terms of the GNU Lesser General

# Public License as published by the Free Software Foundation; 

# Public License as published by the Free Software Foundation

# either version 2.1 of the License, or (at your option) any

# later version.

package/lsof/lsof.mk

+3 −3
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ $(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked 


$(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured

ifeq ($(UCLIBC_HAS_WCHAR),)

	$(SED) 's,^#define[ 	]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h

	$(SED) 's,^#define[ 	]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h

	$(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h

	$(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h

endif

ifeq ($(UCLIBC_HAS_LOCALE),)

	$(SED) 's,^#define[ 	]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h

	$(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h

endif

	$(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src

package/vsftpd/vsftpd.mk

+4 −4
Original line number Diff line number Diff line
@@ -29,15 +29,15 @@ $(VSFTPD_DIR)/.unpacked: $(DL_DIR)/$(VSFTPD_SOURCE) 


$(VSFTPD_DIR)/.configured: $(VSFTPD_DIR)/.unpacked

ifeq ($(BR2_PACKAGE_OPENSSL),y)

	$(SED) 's,#undef[ 	]*VSF_BUILD_SSL.*,#define VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h

	$(SED) 's,#undef[[:space:]]*VSF_BUILD_SSL.*,#define VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h

else

	$(SED) 's,#define[ 	]*VSF_BUILD_SSL.*,#undef VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h

	$(SED) 's,#define[[:space:]]*VSF_BUILD_SSL.*,#undef VSF_BUILD_SSL,g' $(VSFTPD_DIR)/builddefs.h

endif

ifneq ($(findstring uclibc,$(BR2_GNU_TARGET_SUFFIX)),)

	$(SED) 's,#define[ 	]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC__,g' $(VSFTPD_DIR)/builddefs.h

	$(SED) 's,#define[[:space:]]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC__,g' $(VSFTPD_DIR)/builddefs.h

	$(SED) 's,.*__UCLIBC_HAS_LFS__.*,,g' $(VSFTPD_DIR)/builddefs.h

ifeq ($(BR2_LARGEFILE),y)

	$(SED) 's,#define[ 	]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC_HAS_LFS__,g' $(VSFTPD_DIR)/builddefs.h

	$(SED) 's,#define[[:space:]]*VSF_BUILDDEFS_H.*,#define VSF_BUILDDEFS_H\n#define __UCLIBC_HAS_LFS__,g' $(VSFTPD_DIR)/builddefs.h

endif

else # not uclibc

	$(SED) 's,.*__UCLIBC_.*,,g' $(VSFTPD_DIR)/builddefs.h

target/linux-experimental/Makefile.in

+61 −61
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ $(LINUX26_KCONFIG): 
		echo "and install it as $(LINUX26_KCONFIG)"; \

		echo ""; \

		sleep 5; \

	fi;

	fi



# Check if we have a release candidate.

# This makes life complex