Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
280d8751
Commit
280d8751
authored
Feb 14, 2012
by
Jan Engelhardt
Committed by
Mike Gabriel
Feb 14, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args.
parent
165206eb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
0 deletions
+54
-0
changelog
debian/changelog
+1
-0
030_nx-X11_configure-args.diff
debian/patches/030_nx-X11_configure-args.diff
+52
-0
series
debian/patches/series
+1
-0
No files found.
debian/changelog
View file @
280d8751
...
...
@@ -10,6 +10,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
[ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
configure args.
* Add patch: 030_nx-X11_configure-args.diff. Allow passing of configure args.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
...
...
debian/patches/030_nx-X11_configure-args.diff
0 → 100644
View file @
280d8751
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-01-26 23:30:37.605560191 +0100
Upstream: pending
Allow to pass in configure args.
---
nx-X11/lib/X11/Imakefile | 6 ++++--
nx-X11/programs/Xserver/Imakefile | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
Index: nx-X11/lib/X11/Imakefile
===================================================================
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -1147,15 +1147,17 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h
includes:: ks_tables.h
+CONFIGURE=./configure
+
#if NXLibraries
$(NX_XCOMPCONFIGTARGET):
cd ../../../nxcomp && \
- ./configure
+ ${CONFIGURE}
$(NX_XCOMPEXTCONFIGTARGET):
cd ../../../nxcompext && \
- ./configure
+ ${CONFIGURE}
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
Index: nx-X11/programs/Xserver/Imakefile
===================================================================
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1036,9 +1036,11 @@ NX_XSHADOWLIBDIR = $(XTOP)/../nxcomps
NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME)
NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
+CONFIGURE=./configure
+
$(NX_XSHADOWCONFIGTARGET):
cd $(NX_XSHADOWLIBDIR) && \
- ./configure
+ ${CONFIGURE}
#ifdef SunArchitecture
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
debian/patches/series
View file @
280d8751
...
...
@@ -23,6 +23,7 @@
021_add-nxauth-wrapper.full.patch
022_add-nxproxy-wrapper.full+lite.patch
023_add-x2goagent-wrapper.full.patch
030_nx-X11_configure-args.diff
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
102_xserver-xext_set-securitypolicy-path.debian.patch
...
...
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