Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
lede-mikrotik
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johannes Rudolph
lede-mikrotik
Commits
5c2991d8
Commit
5c2991d8
authored
17 years ago
by
Felix Fietkau
Browse files
Options
Downloads
Patches
Plain Diff
add improved autotools fixups
SVN-Revision: 9942
parent
01dd5fc0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/autotools.mk
+30
-0
30 additions, 0 deletions
include/autotools.mk
include/package.mk
+11
-12
11 additions, 12 deletions
include/package.mk
with
41 additions
and
12 deletions
include/autotools.mk
0 → 100644
+
30
−
0
View file @
5c2991d8
#
# Copyright (C) 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define
replace
if
[
-f
"$(PKG_BUILD_DIR)/$(3)$(1)"
-a
-e
"$(2)/$(1)"
];
then
\
rm
-f
$(PKG_BUILD_DIR)/$(3)$(1);
\
ln
-s
$(2)/$(1)
$(PKG_BUILD_DIR)/$(3);
\
fi
endef
# replace copies of ltmain.sh with the build system's version
update_libtool
=
$(
call replace,libtool,
$(
STAGING_DIR
)
/host/bin,
$(
CONFIGURE_PATH
)
/
)$(
call replace,ltmain.sh,
$(
STAGING_DIR
)
/host/share/libtool,
$(
CONFIGURE_PATH
)
/
)
# prevent libtool from linking against host development libraries
define
libtool_fixup_libdir
find
$(PKG_BUILD_DIR)
-name
'*.la'
|
$(XARGS)
\
$(SED)
"s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
endef
ifneq
($(filter libtool,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS
+=
libtool
Hooks/Configure/
Pre
+=
update_libtool
Hooks/Configure/
Post
+=
update_libtool
Hooks/Build/
Post
+=
libtool_fixup_libdir
endif
This diff is collapsed.
Click to expand it.
include/package.mk
+
11
−
12
View file @
5c2991d8
...
@@ -27,6 +27,7 @@ include $(INCLUDE_DIR)/package-defaults.mk
...
@@ -27,6 +27,7 @@ include $(INCLUDE_DIR)/package-defaults.mk
include
$(INCLUDE_DIR)/package-dumpinfo.mk
include
$(INCLUDE_DIR)/package-dumpinfo.mk
include
$(INCLUDE_DIR)/package-ipkg.mk
include
$(INCLUDE_DIR)/package-ipkg.mk
include
$(INCLUDE_DIR)/package-bin.mk
include
$(INCLUDE_DIR)/package-bin.mk
include
$(INCLUDE_DIR)/autotools.mk
override
MAKEFLAGS
=
override
MAKEFLAGS
=
export
CONFIG_SITE
:=
$(
INCLUDE_DIR
)
/site/
$(
REAL_GNU_TARGET_NAME
)
export
CONFIG_SITE
:=
$(
INCLUDE_DIR
)
/site/
$(
REAL_GNU_TARGET_NAME
)
...
@@ -50,6 +51,10 @@ define Download/default
...
@@ -50,6 +51,10 @@ define Download/default
MD5SUM
:=
$(
PKG_MD5SUM
)
MD5SUM
:=
$(
PKG_MD5SUM
)
endef
endef
define
sep
endef
define
Build/DefaultTargets
define
Build/DefaultTargets
$(
if
$(
QUILT
)
,
$(
Build/Quilt
))
$(
if
$(
QUILT
)
,
$(
Build/Quilt
))
$(
if
$(
strip
$(
PKG_SOURCE_URL
))
,
$(
call Download,default
))
$(
if
$(
strip
$(
PKG_SOURCE_URL
))
,
$(
call Download,default
))
...
@@ -58,15 +63,21 @@ define Build/DefaultTargets
...
@@ -58,15 +63,21 @@ define Build/DefaultTargets
$(STAMP_PREPARED)
:
$(STAMP_PREPARED)
:
@
-rm
-rf
$(
PKG_BUILD_DIR
)
@
-rm
-rf
$(
PKG_BUILD_DIR
)
@
mkdir
-p
$(
PKG_BUILD_DIR
)
@
mkdir
-p
$(
PKG_BUILD_DIR
)
$(
foreach hook,
$(
Hooks/Prepare/Pre
)
,
$(
call
$(
hook
))$(
sep
))
$(
Build/Prepare
)
$(
Build/Prepare
)
$(
foreach hook,
$(
Hooks/Prepare/Post
)
,
$(
call
$(
hook
))$(
sep
))
touch
$$
@
touch
$$
@
$(STAMP_CONFIGURED)
:
$(STAMP_PREPARED)
$(STAMP_CONFIGURED)
:
$(STAMP_PREPARED)
$(
foreach hook,
$(
Hooks/Configure/Pre
)
,
$(
call
$(
hook
))$(
sep
))
$(
Build/Configure
)
$(
Build/Configure
)
$(
foreach hook,
$(
Hooks/Configure/Post
)
,
$(
call
$(
hook
))$(
sep
))
touch
$$
@
touch
$$
@
$(STAMP_BUILT)
:
$(STAMP_CONFIGURED)
$(STAMP_BUILT)
:
$(STAMP_CONFIGURED)
$(
foreach hook,
$(
Hooks/Compile/Pre
)
,
$(
call
$(
hook
))$(
sep
))
$(
Build/Compile
)
$(
Build/Compile
)
$(
foreach hook,
$(
Hooks/Compile/Post
)
,
$(
call
$(
hook
))$(
sep
))
touch
$$
@
touch
$$
@
$(STAMP_INSTALLED)
:
$(STAMP_BUILT)
$(STAMP_INSTALLED)
:
$(STAMP_BUILT)
...
@@ -126,18 +137,6 @@ endif
...
@@ -126,18 +137,6 @@ endif
$(
if
$(
DUMP
)
,,
$(
call Build/DefaultTargets,
$(
1
)))
$(
if
$(
DUMP
)
,,
$(
call Build/DefaultTargets,
$(
1
)))
endef
endef
# prevent libtool from setting rpath when linking
define
libtool_disable_rpath
find
$(PKG_BUILD_DIR)
-name
'libtool'
|
$(XARGS)
\
$(SED)
's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ",g'
endef
# prevent libtool from linking against host development libraries
define
libtool_fixup_libdir
find
$(PKG_BUILD_DIR)
-name
'*.la'
|
$(XARGS)
\
$(SED)
"s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
endef
define
pkg_install_files
define
pkg_install_files
$(
foreach
install_file,
$(
1
)
,
$(
INSTALL_DIR
)
$(
3
)
/
`
dirname
$(
install_file
)
`
;
$(
INSTALL_DATA
)
$(
2
)
/
$(
install_file
)
$(
3
)
/
`
dirname
$(
install_file
)
`
;)
$(
foreach
install_file,
$(
1
)
,
$(
INSTALL_DIR
)
$(
3
)
/
`
dirname
$(
install_file
)
`
;
$(
INSTALL_DATA
)
$(
2
)
/
$(
install_file
)
$(
3
)
/
`
dirname
$(
install_file
)
`
;)
endef
endef
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment