projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/e2fsprogs: fix build with clang
[openwrt/openwrt.git]
/
tools
/
e2fsprogs
/
Makefile
diff --git
a/tools/e2fsprogs/Makefile
b/tools/e2fsprogs/Makefile
index 60047c763ab859b6021c24d9bc95e78b2a572b66..f11ce52ca09c73a65574a98653780442dbbcdccb 100644
(file)
--- a/
tools/e2fsprogs/Makefile
+++ b/
tools/e2fsprogs/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2010-201
3
OpenWrt.org
+# Copyright (C) 2010-201
5
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-8,25
+8,26
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.42.8
-PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4
+PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
+PKG_VERSION:=1.44.4
+PKG_HASH:=ee03b2f2180614c5ae5f6dd2666f8808de61c3d8b37d22ba86cc6daea25be55a
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.
g
z
-PKG_SOURCE_URL:=@
SF/e2fsprogs
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.
x
z
+PKG_SOURCE_URL:=@
KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
+ifneq ($(shell $(HOSTCC) --version | grep clang),)
+ HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0
+endif
HOST_CFLAGS += $(FPIC)
HOST_CFLAGS += $(FPIC)
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
HOST_CONFIGURE_ARGS += \
HOST_CONFIGURE_ARGS += \
- --disable-shared \
--disable-elf-shlibs \
--disable-elf-shlibs \
- --enable-static \
- --enable-dynamic-e2fsck \
+ --enable-libuuid \
--disable-tls \
--disable-nls
--disable-tls \
--disable-nls