Skip to contentSkip to conversation

c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

PATCH New Guillaume GARDET 2 participants 7 messages Jul 22, 2015 – Jul 24, 2015

lore
Share & tools
lore

Guillaume GARDET

author
#0 lore raw

PATCH 1/1 c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

Reported-by Thomas Petazzoni <[email protected]>
Signed-off-by Guillaume GARDET <[email protected]>
---
 package/c-icap/c-icap.mk | 2 ++
 1 file changed, 2 insertions(+)
package/c-icap/c-icap.mk +2 -0
index 0f42b6c..00a250b 100644
@@ -57,6 +57,8 @@ define C_ICAP_TUNE_INSTALLATION
 		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
 	$(SED) 's%INCDIR2=.*%INCDIR2=$(STAGING_DIR)/usr/include/c_icap%' \
 		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
+	$(SED) 's%LIBS="-L%LIBS="-L$(STAGING_DIR)%' \
+		$(STAGING_DIR)/usr/bin/c-icap-libicapapi-config
 endef
 
 C_ICAP_POST_INSTALL_TARGET_HOOKS += C_ICAP_TUNE_INSTALLATION
Signature · 1 line
1.8.4.5
#1 lore raw

PATCH 1/1 c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

Guillaume,

Thanks for the patch!

Quoted 12 lines · Guillaume GARDET
Reported-by Thomas Petazzoni <[email protected]>
Signed-off-by Guillaume GARDET <[email protected]>
---
 package/c-icap/c-icap.mk | 2 ++
 1 file changed, 2 insertions(+)
package/c-icap/c-icap.mk +0 -0
index 0f42b6c..00a250b 100644

package/c-icap/c-icap.mk define C_ICAP_TUNE_INSTALLATION · line 61

Quoted 5 lines
package/c-icap/c-icap.mk +2 -0
@@ -57,6 +57,8 @@ define C_ICAP_TUNE_INSTALLATION
 		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
 	$(SED) 's%INCDIR2=.*%INCDIR2=$(STAGING_DIR)/usr/include/c_icap%' \
 		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
+	$(SED) 's%LIBS="-L%LIBS="-L$(STAGING_DIR)%' \
+		$(STAGING_DIR)/usr/bin/c-icap-libicapapi-config

Ah, right, I missed this one! However, I think it's useless to keep this -L option, this $(STAGING_DIR)/usr/lib is already in the library search path for the cross-compiler.

What about just:

	$(SED) 's%-L$LIBDIR %%' $(STAGING_DIR)/usr/bin/c-icap-libicapapi-config

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

Le 22/07/2015 14:55, Thomas Petazzoni a ?crit :

Quoted 26 lines

Guillaume,

Thanks for the patch!

Quoted 12 lines · Guillaume GARDET
Reported-by Thomas Petazzoni <[email protected]>
Signed-off-by Guillaume GARDET <[email protected]>
---
  package/c-icap/c-icap.mk | 2 ++
  1 file changed, 2 insertions(+)
package/c-icap/c-icap.mk +0 -0
index 0f42b6c..00a250b 100644

package/c-icap/c-icap.mk define C_ICAP_TUNE_INSTALLATION · line 61

Quoted 5 lines
package/c-icap/c-icap.mk +2 -0
@@ -57,6 +57,8 @@ define C_ICAP_TUNE_INSTALLATION
  		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
  	$(SED) 's%INCDIR2=.*%INCDIR2=$(STAGING_DIR)/usr/include/c_icap%' \
  		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
+	$(SED) 's%LIBS="-L%LIBS="-L$(STAGING_DIR)%' \
+		$(STAGING_DIR)/usr/bin/c-icap-libicapapi-config

Ah, right, I missed this one! However, I think it's useless to keep this -L option, this $(STAGING_DIR)/usr/lib is already in the library search path for the cross-compiler.

Quoted 3 lines

What about just:

	$(SED) 's%-L$LIBDIR %%' $(STAGING_DIR)/usr/bin/c-icap-libicapapi-config

Ok, but $ sign must be escaped with another $:

         $(SED) 's%-L$$LIBDIR %%' $(STAGING_DIR)/usr/bin/c-icap-libicapapi-config

Do you want a I send a V2 with this solution?

Guillaume

Quoted 4 lines

Thanks,

Thomas

#3 lore raw

PATCH 1/1 c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

Guillaume,

Quoted 6 lines · Guillaume GARDET - Olis?o
Quoted 3 lines

What about just:

	$(SED) 's%-L$LIBDIR %%' $(STAGING_DIR)/usr/bin/c-icap-libicapapi-config

Ok, but $ sign must be escaped with another $:

         $(SED) 's%-L$$LIBDIR %%' $(STAGING_DIR)/usr/bin/c-icap-libicapapi-config

Ah, yes, indeed. I missed that since I quickly tested the solution in a shell.

Quoted 1 line

Do you want a I send a V2 with this solution?

Yes, please!

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#4 lore raw

PATCH v2 1/1 c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

Reported-by Thomas Petazzoni <[email protected]>
Signed-off-by Guillaume GARDET <[email protected]>
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/c-icap/c-icap.mk | 1 +
 1 file changed, 1 insertion(+)
package/c-icap/c-icap.mk +1 -0
index 0f42b6c..0e27cc4 100644
@@ -57,6 +57,7 @@ define C_ICAP_TUNE_INSTALLATION
 		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
 	$(SED) 's%INCDIR2=.*%INCDIR2=$(STAGING_DIR)/usr/include/c_icap%' \
 		$(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config
+	$(SED) 's%-L$$LIBDIR %%' $(STAGING_DIR)/usr/bin/c-icap-libicapapi-config
 endef
 
 C_ICAP_POST_INSTALL_TARGET_HOOKS += C_ICAP_TUNE_INSTALLATION
Signature · 1 line
1.8.4.5
#5 lore raw

PATCH v2 1/1 c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

Dear Guillaume GARDET,

Quoted 3 lines · Guillaume GARDET
Reported-by Thomas Petazzoni <[email protected]>
Signed-off-by Guillaume GARDET <[email protected]>
Signed-off-by Thomas Petazzoni <[email protected]>

I applied, but quite a few things were still wrong with the patch:

* The commit title is too long. It should be less than 80 characters. The commit title should only be a summary of the commit log itself.

* The commit title is wrong: you're no longer adding $(STAGING_DIR) to the link path

* The commit log was missing a reference to the autobuilder failure that this patch is fixing.

I've fixed those problems and applied. See:

http://git.buildroot.net/buildroot/commit/?id=6c73215493335f1ede26cad2d3898ef543d871d6

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#6 lore raw

PATCH v2 1/1 c-icap: fix config script by adding $(STAGING_DIR) prefix to link path. It fixes c-icap-modules build.

Le 23/07/2015 23:11, Thomas Petazzoni a ?crit :

Quoted 14 lines

Dear Guillaume GARDET,

Quoted 3 lines · Guillaume GARDET
Reported-by Thomas Petazzoni <[email protected]>
Signed-off-by Guillaume GARDET <[email protected]>
Signed-off-by Thomas Petazzoni <[email protected]>

I applied, but quite a few things were still wrong with the patch:

* The commit title is too long. It should be less than 80 characters. The commit title should only be a summary of the commit log itself.

* The commit title is wrong: you're no longer adding $(STAGING_DIR) to the link path

Quoted 6 lines

* The commit log was missing a reference to the autobuilder failure that this patch is fixing.

I've fixed those problems and applied. See:

   http://git.buildroot.net/buildroot/commit/?id=6c73215493335f1ede26cad2d3898ef543d871d6

Thanks.
I copy/paste V1 to V2 too quickly. Sorry.

Guillaume

Quoted 4 lines

Thanks,

Thomas