Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
63d88de2
Commit
63d88de2
authored
Nov 11, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: qt4: fix build in 32-bit chroot with 64-bit kernel
parent
673d6562
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
contrib/src/qt4/chroot.patch
contrib/src/qt4/chroot.patch
+13
-0
contrib/src/qt4/rules.mak
contrib/src/qt4/rules.mak
+1
-0
No files found.
contrib/src/qt4/chroot.patch
0 → 100644
View file @
63d88de2
Fix build when using a 32-bit chroot with a x86_64 kernel
Native tools would be built with -m64
--- qt-everywhere-opensource-src-4.7.4/configure.orig 2011-11-11 14:48:12.944666802 -0500
+++ qt-everywhere-opensource-src-4.7.4/configure 2011-11-11 14:48:55.108875882 -0500
@@ -168,7 +168,7 @@
#-------------------------------------------------------------------------------
# need that throughout the script
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_MACHINE=`(gcc -dumpmachine|cut -d- -f1) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
contrib/src/qt4/rules.mak
View file @
63d88de2
...
...
@@ -21,6 +21,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
$(UNPACK)
patch
-p0
<
$(SRC)
/qt4/cross.patch
patch
-p0
<
$(SRC)
/qt4/styles.patch
patch
-p0
<
$(SRC)
/qt4/chroot.patch
patch
-p0
<
$(SRC)
/qt4/imageformats.patch
mv
qt-everywhere-opensource-src-4.7.4
$@
&&
touch
$@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment