Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
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
redox-os
cookbook
Commits
e455d711
Verified
Commit
e455d711
authored
6 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Reenable patched pkg-config
parent
ce09215a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/x86_64-unknown-redox-pkg-config
+1
-1
1 addition, 1 deletion
bin/x86_64-unknown-redox-pkg-config
config.sh
+3
-1
3 additions, 1 deletion
config.sh
with
4 additions
and
2 deletions
bin/x86_64-unknown-redox-pkg-config
100644 → 100755
+
1
−
1
View file @
e455d711
...
...
@@ -4,4 +4,4 @@ export PKG_CONFIG_PATH=
export
PKG_CONFIG_SYSROOT_DIR
=
"
${
COOKBOOK_RECIPE
}
/sysroot"
export
PKG_CONFIG_LIBDIR
=
"
${
PKG_CONFIG_SYSROOT_DIR
}
/lib/pkgconfig"
exec
pkg-config
"
$@
"
exec
pkg-config
--static
"
$@
"
This diff is collapsed.
Click to expand it.
config.sh
+
3
−
1
View file @
e455d711
...
...
@@ -23,11 +23,13 @@ export LD="${HOST}-ld"
export
NM
=
"
${
HOST
}
-nm"
export
OBJCOPY
=
"
${
HOST
}
-objcopy"
export
OBJDUMP
=
"
${
HOST
}
-objdump"
#
export PKG_CONFIG="${HOST}-pkg-config"
export
PKG_CONFIG
=
"
${
HOST
}
-pkg-config"
export
RANLIB
=
"
${
HOST
}
-ranlib"
export
READELF
=
"
${
HOST
}
-readelf"
export
STRIP
=
"
${
HOST
}
-strip"
export
PKG_CONFIG_FOR_BUILD
=
"pkg-config"
if
[[
"
$OSTYPE
"
==
"darwin"
*
]]
;
then
# GNU find
FIND
=
"gfind"
;
...
...
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