-
Notifications
You must be signed in to change notification settings - Fork 716
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Building with seperate SOURCE and BUILD directories npa-tool.ggo issues #823
Comments
@frankmorgner can you look at this. npa-tool.c has #ifdef ENABLE_OPENPACE and if not defined program returns -1. CircumventionSo for now, I am sticking with: issue823-hack-no-openpace.diff.txt that modifies configure.ac to not build npa-tool if openpace is not found. |
same subject in #822 |
I propose you to:
|
+1 |
Hmm, the PR was open more than half a year and I announced the merged more than two weeks ago. I would have loved to get these comments earlier. I'll look into gengetopt later this week. @viktorTarasov if you are more specific about the source layout and the coding style I'll have a look at this as well. |
The current master is broken. If you have no time, I can revert it for you.
It's strange that I have to explain it to you -- the card specific stuff has to be placed into the dedicated folders. If you are not agree -- expose your arguments.
"use tabs, no space" |
Douglas E. Engert [email protected] |
Please calm down everyone. Even if there are any problems, I think those can be resolved leaving nobody behind. It's true that master got an additional dependency, which was gengetopt (not OpenPACE). This should be fixed with 9883446 (one day after report); OpenSC now builds with its usual dependencies. I'm still not sure what source layout you'd prefer, @viktorTarasov.
I don't think that we need to fight over some folder structure. Just choose what you like. Regarding the indenting, please see #826. |
@frankmorgner |
I don't think it's possible to change or rewrite the history in master anymore. This would basically destroy the git history of everyone who checked it out after the merge. After all, there are only a handfull of fixups that would disappear. Believe me, there were many more iterations to get the full blown and robust implementation we have now. The full history is available here https://github.com/frankmorgner/vsmartcard/tree/master/npa. I tried to explain the reasoning behind the source layout above (#823 (comment)). Do you see a problem with this? |
For you we will do an exception. |
With #611 I merged 20 commits, from which 10 are fixups that could be squashed. Please look at the OpenSC history we have now, there are a ton of fixups and many bad commit messages that piled up in the past. Are you really, really sure that you want to destroy any local copy of the repository just for kicking out 10 lines in the git history? |
As for the source layout :
I still maintain my proposal to rebase master -- rebase your contribution, remove merge of #795, probably something else. Think about using 'sc_log' instead of 'sc_debug' ... For the future -- no dumb merges for the verbose PRs: author or committer has to rebase such PRs to the reasonably minimal number of commits. |
I guess you meant something like a silent merge, right? |
I mean merge with the merge-PR button of github interface, without any regards onto the history of the branch to be merged . |
@frankmorgner The previous master is saved as master-with-mrtd. We can start the discussion around your mrtd contribution from the begining. |
Expected behaviour
npa-tool.ggo needs to be written to either SOURCE or BUILD so it can be read from that directory.
Problem started today after git pull of master.
Actual behaviour
SOURCE = /afs/anl.gov/appl/OpenSC-dev/build/opensc-git-my/OpenSC
BUILD = /afs/anl.gov/appl/OpenSC-dev/build/opensc-git-my/amd64_linux26-1.0.1
../src/configure
--disable-silent-rules
--prefix=$PREFIX (plus other options not part of this problem)
make then has these errors:
make[3]: Entering directory `/afs/anl.gov/appl/OpenSC-dev/build/opensc-git-my/amd64_linux26-1.0.1/src/tools'
/bin/sed -e 's,[@]CVCDIR[@],,g' -e 's,[@]PACKAGE[@],opensc,g' -e 's,[@]PACKAGE_BUGREPORT[@],[email protected],g' -e 's,[@]PACKAGE_NAME[@],Open SC,g' -e 's,[@]PACKAGE_TARNAME[@],opensc,g' -e 's,[@]PACKAGE_URL[@],,g' -e 's,[@]PACKAGE_SUMMARY[@],,g' -e 's,[@]PACKAGE_VERSION[@],"0.16.0",g' -e 's,[@]X509DI R[@],,g' < ../../../src/src/tools/npa-tool.ggo.in > ../../../src/src/tools/npa-tool.ggo
/usr/bin/gengetopt --output-dir=../../../src/src/tools < npa-tool.ggo
/bin/bash: npa-tool.ggo: No such file or directory
make[3]: *** [cmdline.h] Error 1
make[3]: Leaving directory `/afs/anl.gov/appl/OpenSC-dev/build/opensc-git-my/amd64_linux26-1.0.1/src/tools'
The problem is:
/bin/sed writes ../../../src/src/tools/npa-tool.ggo into SOURCE
/usr/bin/gengetopt tried to read npa-tool.ggo from the current BUILD
Where should it be written?
What needs to be changed here. The help2man looks like it will also have a problem.
./src/tools/Makefile.in$(GENGETOPT) --output-dir=$ (srcdir) < $<$(do_subst) < $ < > $(srcdir)/$ @
1171 $(BUILT_SOURCES): npa-tool.ggo
1172
1173
1174 npa-tool.ggo: npa-tool.ggo.in
1175
1176
1177 $(abs_builddir)/npa-tool.1: npa-tool.ggo.in
1178 $(HELP2MAN)
1179 --output=$@
1180 --no-info
1181 --source='$(PACKAGE_STRING)'
1182 $(builddir)/npa-tool
Steps to reproduce
The text was updated successfully, but these errors were encountered: