Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
purr-data
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
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
brittney allen
purr-data
Commits
f7238f54
Commit
f7238f54
authored
7 years ago
by
Albert Gräf
Browse files
Options
Downloads
Patches
Plain Diff
Remove patch to packages Makefile from debuild, it's not needed any more.
parent
df7f0838
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debuild/Makefile
+0
-3
0 additions, 3 deletions
debuild/Makefile
debuild/packages-Makefile.patch
+0
-22
0 additions, 22 deletions
debuild/packages-Makefile.patch
with
0 additions
and
25 deletions
debuild/Makefile
+
0
−
3
View file @
f7238f54
...
...
@@ -113,9 +113,6 @@ $(debsrc):
# Pre-generate and put s_stuff.h into the tarball (see above; the build
# version is generated using git which can't be done outside the git repo).
sed
's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|'
../pd/src/s_stuff.h.in
>
$(debdist)/pd/src/s_stuff.h
# Patch packages/Makefile so that we do *not* try to regenerate s_stuff.h
# during the build.
cd
$(debdist)
&&
patch
-p1
<
../packages-Makefile.patch
# Create the source tarball.
tar
cfz
$(debsrc)
$(debdist)
rm
-rf
$(debdist)
...
...
This diff is collapsed.
Click to expand it.
debuild/packages-Makefile.patch
deleted
100644 → 0
+
0
−
22
View file @
df7f0838
diff --git a/packages/Makefile b/packages/Makefile
index a360dba7..b5b949b5 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -377,7 +377,7 @@
doc_format:
# from the latter by substituting PD_BUILD_VERSION.
git_version: $(pd_src)/src/s_stuff.h.in
- @cd $(pd_src)/src/ && \
+ @test -d $(cvs_root_dir)/.git && cd $(pd_src)/src/ && \
sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' s_stuff.h.in > s_stuff.h.new && \
(test -f s_stuff.h && diff -q s_stuff.h s_stuff.h.new > /dev/null && rm -f s_stuff.h.new && echo s_stuff.h unchanged || (rm -f s_stuff.h && mv s_stuff.h.new s_stuff.h))
@@ -422,7 +422,7 @@
distclean: cruft_clean
$(MAKE) -C $(abstractions_src) distclean
$(MAKE) -C $(extensions_src) distclean
$(MAKE) -C $(externals_src) distclean
- -$(MAKE) -C $(pd_src) distclean
+ -$(MAKE) -C $(pd_src) clean
test_locations:
@echo "PD_VERSION: $(PD_VERSION)"
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