Fix building static podman-remote
As near as I can tell, sometime between `v1.6.4` and `v1.9` the definition of `LDFLAGS_PODMAN_STATIC` was both created and lost. Additionally, after a refactoring of the `Makefile` it was possible to enable CGO (which will cause a dynamic binary to be built). Fix both issues by adding the missing definition and forcing CGO to be disabled. Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
		
							parent
							
								
									e2f51eeb06
								
							
						
					
					
						commit
						5f2c0f63ad
					
				
							
								
								
									
										15
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										15
									
								
								Makefile
								
								
								
								
							|  | @ -93,11 +93,14 @@ LIBPOD := ${PROJECT}/v3/libpod | ||||||
| GCFLAGS ?= all=-trimpath=$(CURDIR) | GCFLAGS ?= all=-trimpath=$(CURDIR) | ||||||
| ASMFLAGS ?= all=-trimpath=$(CURDIR) | ASMFLAGS ?= all=-trimpath=$(CURDIR) | ||||||
| LDFLAGS_PODMAN ?= \
 | LDFLAGS_PODMAN ?= \
 | ||||||
| 	  -X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \
 | 	-X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \
 | ||||||
| 	  -X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \
 | 	-X $(LIBPOD)/define.buildInfo=$(BUILD_INFO) \
 | ||||||
| 	  -X $(LIBPOD)/config._installPrefix=$(PREFIX) \
 | 	-X $(LIBPOD)/config._installPrefix=$(PREFIX) \
 | ||||||
| 	  -X $(LIBPOD)/config._etcDir=$(ETCDIR) \
 | 	-X $(LIBPOD)/config._etcDir=$(ETCDIR) \
 | ||||||
| 	  $(EXTRA_LDFLAGS) | 	$(EXTRA_LDFLAGS) | ||||||
|  | LDFLAGS_PODMAN_STATIC ?= \
 | ||||||
|  | 	$(LDFLAGS_PODMAN) \
 | ||||||
|  | 	-extldflags=-static | ||||||
| #Update to LIBSECCOMP_COMMIT should reflect in Dockerfile too.
 | #Update to LIBSECCOMP_COMMIT should reflect in Dockerfile too.
 | ||||||
| LIBSECCOMP_COMMIT := v2.3.3 | LIBSECCOMP_COMMIT := v2.3.3 | ||||||
| # Rarely if ever should integration tests take more than 50min,
 | # Rarely if ever should integration tests take more than 50min,
 | ||||||
|  | @ -314,7 +317,7 @@ $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum | ||||||
| 		-o $@ ./cmd/podman | 		-o $@ ./cmd/podman | ||||||
| 
 | 
 | ||||||
| $(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum | $(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum | ||||||
| 	CGO_ENABLED=$(CGO_ENABLED) \
 | 	CGO_ENABLED=0 \
 | ||||||
| 		GOOS=$(GOOS) \
 | 		GOOS=$(GOOS) \
 | ||||||
| 		$(GO) build \
 | 		$(GO) build \
 | ||||||
| 		$(BUILDFLAGS) \
 | 		$(BUILDFLAGS) \
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue