Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools/automake: Cherry pick from LEDE to fix bad regex -- open bracke… #17

Open
wants to merge 1 commit into
base: chaos_calmer
Choose a base branch
from
Open

tools/automake: Cherry pick from LEDE to fix bad regex -- open bracke… #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tools/automake/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=automake
PKG_VERSION:=1.15
PKG_CPE_ID:=cpe:/a:gnu:automake
PKG_VERSION:=1.15.1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/automake
PKG_MD5SUM:=9a1ddb0e053474d9d1105cfe39b0c48d
PKG_HASH:=af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf

include $(INCLUDE_DIR)/host-build.mk

Expand All @@ -24,7 +25,7 @@ HOST_CONFIGURE_VARS += \
am_cv_prog_PERL_ithreads=no

define Host/Configure
(cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) STAGING_DIR="" ./bootstrap.sh)
(cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) STAGING_DIR="" ./bootstrap)
$(call Host/Configure/Default)
endef

Expand Down
8 changes: 4 additions & 4 deletions tools/automake/patches/000-relocatable.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
+
# aclocal - create aclocal.m4 by scanning configure.ac

# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
@@ -27,7 +29,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";

BEGIN
Expand Down Expand Up @@ -59,7 +59,7 @@
+$^W = 1;
+
# automake - create Makefile.in from Makefile.am
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.

@@ -31,7 +33,7 @@ use strict;

Expand All @@ -79,7 +79,7 @@

+$^W = 1;
+
# Copyright (C) 2012-2014 Free Software Foundation, Inc.
# Copyright (C) 2012-2017 Free Software Foundation, Inc.

# This program is free software; you can redistribute it and/or modify
--- a/t/wrap/automake.in
Expand All @@ -91,6 +91,6 @@

+$^W = 1;
+
# Copyright (C) 2012-2014 Free Software Foundation, Inc.
# Copyright (C) 2012-2017 Free Software Foundation, Inc.

# This program is free software; you can redistribute it and/or modify